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=7feacb892000b0b7a2b52e548f6103e07bb83900;hpb=49525303bc07064d60b3dde3056b2e9e8a379435;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 7feacb89..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
@@ -31,7 +31,6 @@ import java.util.TreeMap;
 
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.util.Chmod;
 import org.onap.aaf.misc.env.util.Chrono;
 
@@ -93,31 +92,38 @@ public class PropHolder {
 		return keyfile.getAbsolutePath();
 	}
 
-	public void add(final String tag, final String value) {
-		if(value==null) {
-			props.put(tag,"");
-		} else {
-			props.put(tag, value);
-		}
+	public String add(final String tag, final String value) {
+		final String rv = value==null?"":value;
+		props.put(tag, rv);
+		return rv;
 	}
 
-	public void add(final String tag, Access orig, final String def) {
-		add(tag, orig.getProperty(tag, def));
+	public String add(final String tag, Access orig, final String def) {
+		return add(tag, orig.getProperty(tag, def));
 	}
 
-	public void addEnc(final String tag, final String value) throws IOException {
+	public String addEnc(final String tag, final String value) throws IOException {
+		String rv;
 		if(value==null) {
-			props.put(tag,"");
+			rv = "";
 		} else {
 			if(symm==null) { // Lazy Instantiations... on a few PropFiles have Security
 				symm = ArtifactDir.getSymm(keyfile);
 			}
-			props.put(tag, "enc:"+symm.enpass(value));
+			rv = "enc:"+symm.enpass(value);
 		}
+		props.put(tag, rv);
+		return rv;
 	}
 
 	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 ");