X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FPropHolder.java;h=9d060e6c26937dd65fc69c7420ac6428011d0e0a;hb=628b7105ce4d9818aac69a082e515f9275fd46fd;hp=0f9666caf0358205a45787be9b89cf42bf423ad8;hpb=9fe1153c6bad63922e026d1db86e51b95a92c6cc;p=aaf%2Fauthz.git

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 0f9666ca..9d060e6c 100644
--- 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 {
-		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 {
@@ -141,7 +147,7 @@ public class PropHolder {
                 pw.print('#');
             }
             pw.println();
-            pw.println("# Properties Generated by AT&T Certificate Manager");
+            pw.println("# Properties Generated by AAF Certificate Manager");
             pw.print("#   by ");
             pw.println(System.getProperty("user.name"));
             pw.print("#   on ");