[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSignin...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 21 21:24:20 2014
New Revision: 3724

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3724&view=rev
Log:
Don't try to extract signing key and compute key length unless it's actually needed.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSigningParametersResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSigningParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSigningParametersResolver.java?rev=3724&r1=3723&r2=3724&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSigningParametersResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/SAMLMetadataSignatureSigningParametersResolver.java Fri Mar 21 21:24:20 2014
@@ -115,24 +115,26 @@
             return false;
         }
         
-        Key signingKey = CredentialSupport.extractSigningKey(credential);
-        if (signingKey == null) {
-            log.warn("Could not extract signing key from credential. Failing evaluation");
-            return false;
-        }
-        
-        Integer keyLength = KeySupport.getKeyLength(signingKey);
-        if (keyLength == null) {
-            log.warn("Could not determine key length of candidate signing credential. Failing evaluation");
-            return false;
-        }
-        
-        if (signingMethod.getMinKeySize() != null && keyLength < signingMethod.getMinKeySize()) {
-            return false;
-        }
-        
-        if (signingMethod.getMaxKeySize() != null && keyLength > signingMethod.getMaxKeySize()) {
-            return false;
+        if (signingMethod.getMinKeySize() != null  || signingMethod.getMaxKeySize() != null) {
+            Key signingKey = CredentialSupport.extractSigningKey(credential);
+            if (signingKey == null) {
+                log.warn("Could not extract signing key from credential. Failing evaluation");
+                return false;
+            }
+            
+            Integer keyLength = KeySupport.getKeyLength(signingKey);
+            if (keyLength == null) {
+                log.warn("Could not determine key length of candidate signing credential. Failing evaluation");
+                return false;
+            }
+            
+            if (signingMethod.getMinKeySize() != null && keyLength < signingMethod.getMinKeySize()) {
+                return false;
+            }
+            
+            if (signingMethod.getMaxKeySize() != null && keyLength > signingMethod.getMaxKeySize()) {
+                return false;
+            }
         }
         
         return true;