[jboss-cvs] JBossAS SVN: r91087 - trunk/security/src/main/org/jboss/security/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2009-07-10 11:03:21 -0400 (Fri, 10 Jul 2009)
New Revision: 91087

Modified:
   trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
Log:
JBAS-7094: fix leading zeros

Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-07-10 15:01:26 UTC (rev 91086)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-07-10 15:03:21 UTC (rev 91087)
@@ -560,6 +560,21 @@
    public byte[] decode64(String secret) throws Exception
    {
       byte[] encoding = CryptoUtil.fromb64(secret);
+      
+      //JBAS-7094: fix leading zeros
+      if (encoding.length % 8 != 0)
+      {
+         int length = encoding.length;
+         int newLength = ((length / 8) + 1) * 8;
+         int pad = newLength - length; //number of leading zeros
+         byte[] old = encoding;
+         encoding = new byte[newLength];
+         for (int i = old.length - 1; i >= 0; i--)
+         {
+            encoding[i + pad] = old[i];
+         }
+      }
+      
       byte[] decode = decode(encoding);
       return decode;
    }