[java-shib-common COMMIT] in /branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jan 20 19:16:11 2016
New Revision: 1142

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1142&view=rev
Log:
SC-191: Take two.  Move public key Base64 decoding out of base class and into Inline- parser.
Filesystem- parser public key behavior now reverts back to requiring DER-encoded file as it originally did.

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java?rev=1142&r1=1141&r2=1142&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java	(original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java	Wed Jan 20 19:16:11 2016
@@ -26,7 +26,6 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.util.Base64;
 import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.XMLHelper;
 import org.slf4j.Logger;
@@ -125,8 +124,7 @@
             keyPasswordCharArray = keyPassword.toCharArray();
         }
         try {
-            PublicKey pubKey = SecurityHelper.decodePublicKey(Base64.decode(encodedKey, 0, encodedKey.length),
-                    keyPasswordCharArray);
+            PublicKey pubKey = SecurityHelper.decodePublicKey(encodedKey, keyPasswordCharArray);
             builder.addPropertyValue("publicKey", pubKey);
         } catch (KeyException e) {
             throw new FatalBeanException("Unable to create credential, unable to parse public key", e);

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java?rev=1142&r1=1141&r2=1142&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java	(original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java	Wed Jan 20 19:16:11 2016
@@ -19,6 +19,8 @@
 
 import javax.xml.namespace.QName;
 
+import org.opensaml.xml.util.Base64;
+
 /**
  * Spring bean definition parser for inline credential configuration elements.
  */
@@ -29,7 +31,7 @@
 
     /** {@inheritDoc} */
     protected byte[] getEncodedPublicKey(String keyConfigContent) {
-        return keyConfigContent.getBytes();
+        return Base64.decode(keyConfigContent);
     }
     
     /** {@inheritDoc} */