Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Batch work and client
[aaf/authz.git]
/
cadi
/
aaf
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
cadi
/
configure
/
PropHolder.java
diff --git
a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
index
0f9666c
..
9d060e6
100644
(file)
--- a/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
+++ b/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
@@
-117,7
+117,13
@@
public class PropHolder {
}
public void addEnc(final String tag, Access orig, final String def) throws IOException {
}
public void addEnc(final String tag, Access orig, final String def) throws IOException {
- addEnc(tag,orig.getProperty(tag, def));
+ String pwd = orig.getProperty(tag, def);
+ if(pwd==null) {
+ return;
+ } else if(pwd.startsWith("enc:")) {
+ pwd = orig.decrypt(pwd, true);
+ }
+ addEnc(tag,pwd);
}
public void write() throws IOException {
}
public void write() throws IOException {
@@
-141,7
+147,7
@@
public class PropHolder {
pw.print('#');
}
pw.println();
pw.print('#');
}
pw.println();
- pw.println("# Properties Generated by A
T&T
Certificate Manager");
+ pw.println("# Properties Generated by A
AF
Certificate Manager");
pw.print("# by ");
pw.println(System.getProperty("user.name"));
pw.print("# on ");
pw.print("# by ");
pw.println(System.getProperty("user.name"));
pw.print("# on ");