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=afc1d979fe4a64ac3644a4906c9848465c455061;hb=5a081a25fd94da790a59a68195a19bc0ef7aa20c;hp=ea3891f900cf336ee123cd0f1ab5a59eb7bc492c;hpb=dcaa1072621c7e0f586e2965fd8bb952d4b01880;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 ea3891f9..afc1d979 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
@@ -138,7 +138,7 @@ public class Symm {
 		// There can be time efficiencies gained when the underlying keyset consists mainly of ordered 
 		// data (i.e. abcde...).  Therefore, we'll quickly analyze the keyset.  If it proves to have
 		// too much entropy, the "Unordered" algorithm, which is faster in such cases is used.
-		ArrayList<int[]> la = new ArrayList<int[]>();
+		ArrayList<int[]> la = new ArrayList<>();
 		for(int i=0;i<codeset.length;++i) {
 			curr = codeset[i];
 			if(prev+1==curr) { // is next character in set
@@ -450,9 +450,11 @@ public class Symm {
 		   this.range = range;
 	   }
 	   public int convert(int read) throws IOException {
+		   // System.out.print((char)read);
 		   switch(read) {
 			   case -1: 
 			   case '=':
+			   case ' ':
 			   case '\n':
 			   case '\r':
 				   return -1;
@@ -481,7 +483,8 @@ public class Symm {
 		   switch(read) {
 			   case -1: 
 			   case '=':
-			   case '\n': 
+				 case '\n':
+				 case '\r':
 				   return -1;
 		   }
 		   for(int i=0;i<codec.length;++i) {
@@ -660,6 +663,9 @@ public class Symm {
    * @throws IOException
    */
   public void enpass(final String password, final OutputStream os) throws IOException {
+	    if(password==null) {
+	    	throw new IOException("Invalid password passed");
+	    }
 		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		DataOutputStream dos = new DataOutputStream(baos);
 		byte[] bytes = password.getBytes();