[java-opensaml COMMIT] in /trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential: BasicCredentia...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 27 14:44:53 2012
New Revision: 3108

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3108&view=rev
Log:
Check for null private keys during object creation.

Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java?rev=3108&r1=3107&r2=3108&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java Thu Dec 27 14:44:53 2012
@@ -48,7 +48,9 @@
     public BasicCredential(@Nonnull final PublicKey publicKey, @Nullable final PrivateKey privateKey) {
         super();
         setPublicKey(publicKey);
-        setPrivateKey(privateKey);
+        if (privateKey != null) {
+            setPrivateKey(privateKey);
+        }
     }
     
     /**

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java?rev=3108&r1=3107&r2=3108&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java Thu Dec 27 14:44:53 2012
@@ -25,8 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.crypto.SecretKey;
-
-import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.security.x509.BasicX509Credential;
 
@@ -114,8 +112,6 @@
      * @return a credential containing the secret key specified
      */
     @Nonnull public static BasicCredential getSimpleCredential(@Nonnull final SecretKey secretKey) {
-        Constraint.isNotNull(secretKey, "Secret key cannot be null");
-
         return new BasicCredential(secretKey);
     }
 
@@ -128,9 +124,11 @@
      */
     @Nonnull public static BasicCredential getSimpleCredential(@Nonnull final PublicKey publicKey,
             @Nullable final PrivateKey privateKey) {
-        Constraint.isNotNull(publicKey, "Public key cannot be null");
-
-        return new BasicCredential(publicKey, privateKey);
+        if (privateKey != null) {
+            return new BasicCredential(publicKey, privateKey);
+        } else {
+            return new BasicCredential(publicKey);
+        }
     }
 
     /**
@@ -142,9 +140,11 @@
      */
     @Nonnull public static BasicX509Credential getSimpleCredential(@Nonnull final X509Certificate cert,
             @Nullable final PrivateKey privateKey) {
-        Constraint.isNotNull(cert, "Certificate cannot be null");
-
-        return new BasicX509Credential(cert, privateKey);
+        if (privateKey != null) {
+            return new BasicX509Credential(cert, privateKey);
+        } else {
+            return new BasicX509Credential(cert);
+        }
     }
 
 }