X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2FSymm.java;h=65cb81a59461403ecacc7eadd4f58f7cc4fb3af2;hb=d86dd644e1543743cfcbc83b230bd4f2cb2e5d4e;hp=095f6e97c5ed58005abd0969bf8712c5f90986c5;hpb=17ca744723bd652f15d59d6c8555824f6e49018d;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
index 095f6e97..65cb81a5 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
@@ -71,6 +71,7 @@ import org.onap.aaf.cadi.config.Config;
 public class Symm {
 	private static final byte[] DOUBLE_EQ = new byte[] {'=','='}; 
 	public static final String ENC = "enc:";
+	private static final Object LOCK = new Object();
 	private static final SecureRandom random = new SecureRandom();
 	
 	public final char[] codeset;
@@ -207,7 +208,7 @@ public class Symm {
 	}
 
 	public <T> T exec(SyncExec<T> exec) throws Exception {
-		synchronized(ENC) {
+		synchronized(LOCK) {
 			if(keyBytes == null) {
 				keyBytes = new byte[AES.AES_KEY_SIZE/8];
 				int offset = (Math.abs(codeset[0])+47)%(codeset.length-keyBytes.length);
@@ -388,7 +389,9 @@ public class Symm {
     }
 
     public void decode(InputStream is, OutputStream os, int skip) throws IOException {
-    	is.skip(skip);
+    	if(is.skip(skip)!=skip) {
+    		throw new IOException("Error skipping on IOStream in Symm");
+    	}
     	decode(is,os);
     }