[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May  2 06:10:51 2014
New Revision: 5828

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5828&view=rev
Log:
Favor Cryptacular over KeySupport

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicInlineCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineCredentialFactoryBean.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java?rev=5828&r1=5827&r2=5828&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java Fri May  2 06:10:51 2014
@@ -25,8 +25,8 @@
 
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.ResourceBackedMetadataProviderParser;
 
+import org.cryptacular.util.KeyPairUtil;
 import org.opensaml.security.credential.BasicCredential;
-import org.opensaml.security.crypto.KeySupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
@@ -57,7 +57,7 @@
         if (null == privateKey) {
             credential = new BasicCredential(publicKey);
         } else {
-            if (!KeySupport.matchKeyPair(publicKey, privateKey)) {
+            if (!KeyPairUtil.isKeyPair(publicKey, privateKey)) {
                 log.error("{}: Public and private keys do not match", getConfigFile());
                 throw new BeanCreationException("Public and private keys do not match");
             }
@@ -89,7 +89,11 @@
      * @param password The password to set.
      */
     public void setSecretKeyPassword(@Nullable char[] password) {
-        secretKeyPassword = password;
+        if (null != password && secretKeyPassword.length > 0) {
+            secretKeyPassword = password;
+        } else {
+            secretKeyPassword = null;
+        }
     }
 
     /**

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java?rev=5828&r1=5827&r2=5828&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java Fri May  2 06:10:51 2014
@@ -115,7 +115,11 @@
      * @param password The password to set.
      */
     public void setPrivateKeyPassword(@Nullable char[] password) {
-        privateKeyPassword = password;
+        if (null != password && password.length > 0) {
+            privateKeyPassword = password;
+        } else {
+            privateKeyPassword = null;
+        }
     }
 
     /** For logging, get the file that defined this bean.

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java?rev=5828&r1=5827&r2=5828&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java Fri May  2 06:10:51 2014
@@ -28,8 +28,8 @@
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.ResourceBackedMetadataProviderParser;

[... 74 lines stripped ...]