[java-identity-provider] branch master updated: Use our matchKeyPair method.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=f0d54bb27aaab5d53b3c2ca3c09ca543f06e8d88

The following commit(s) were added to refs/heads/master by this push:
       new  f0d54bb   Use our matchKeyPair method.
f0d54bb is described below

commit f0d54bb27aaab5d53b3c2ca3c09ca543f06e8d88
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 29 13:05:58 2017 -0500

    Use our matchKeyPair method.
---
 .../profile/spring/factory/AbstractBasicCredentialFactoryBean.java    | 4 ++--
 .../idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractBasicCredentialFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractBasicCredentialFactoryBean.java
index d1469f9..29942a7 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractBasicCredentialFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractBasicCredentialFactoryBean.java
@@ -30,9 +30,9 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.util.encoders.Hex;
-import org.cryptacular.util.KeyPairUtil;
 import org.opensaml.security.credential.BasicCredential;
 import org.opensaml.security.credential.UsageType;
+import org.opensaml.security.crypto.KeySupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
@@ -122,7 +122,7 @@ public abstract class AbstractBasicCredentialFactoryBean extends AbstractCredent
             if (null == privateKey) {
                 credential = new BasicCredential(publicKey);
             } else {
-                if (!KeyPairUtil.isKeyPair(publicKey, privateKey)) {
+                if (!KeySupport.matchKeyPair(publicKey, privateKey)) {
                     log.error("{}: Public and private keys do not match", getConfigDescription());
                     throw new BeanCreationException("Public and private keys do not match");
                 }
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java
index 0842da9..d88e3b5 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
-import org.cryptacular.util.KeyPairUtil;
 import org.opensaml.security.credential.UsageType;
+import org.opensaml.security.crypto.KeySupport;
 import org.opensaml.security.x509.BasicX509Credential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@ public abstract class AbstractX509CredentialFactoryBean extends AbstractCredenti
         } else {
             credential = new BasicX509Credential(entityCertificate, privateKey);
 
-            if (!KeyPairUtil.isKeyPair(entityCertificate.getPublicKey(), privateKey)) {
+            if (!KeySupport.matchKeyPair(entityCertificate.getPublicKey(), privateKey)) {
                 log.error("{}: Public and private keys do not match", getConfigDescription());
                 throw new BeanCreationException("Public and private keys do not match");
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.