initSymCiphers() now generates correct string (https://issues.jboss.o…

…rg/browse/JGRP-1321)
belaban · Nov 16, 2011 · 56de006 · 56de006
1 parent 50b5bf0
commit 56de006
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/org/jgroups/protocols/ENCRYPT.java b/src/org/jgroups/protocols/ENCRYPT.java
@@ -360,22 +360,22 @@ private void initSymCiphers(String algorithm, SecretKey secret) throws Exception
         digest.reset();
         digest.update(secret.getEncoded());
 
-        symVersion=new String(digest.digest(), "UTF-8");
+        symVersion = byteArrayToHexString(digest.digest());
         if(log.isDebugEnabled()) {
             log.debug(" Initialized symmetric ciphers with secret key (" + symVersion.length() + " bytes)");
-	    /*
-            StringBuilder sb=new StringBuilder(" Initialized symmetric ciphers with secret key (" + symVersion.length()
-                                               + " bytes) ");
-            char[] arr=symVersion.toCharArray();
-            for(int i=0;i < arr.length;i++) {
-                char c=arr[i];
-                sb.append((int)c);
-            }
-            log.debug(sb.toString());
-	    */
         }
     }
 
+    protected static String byteArrayToHexString(byte[] b){
+        StringBuilder sb = new StringBuilder(b.length * 2);
+        for (int i = 0; i < b.length; i++){
+            int v = b[i] & 0xff;
+            if (v < 16) { sb.append('0'); }
+            sb.append(Integer.toHexString(v));
+        }
+        return sb.toString().toUpperCase();
+    }
+
     /**
      * Generates the public/private key pair from the init params
      *