[java-opensaml COMMIT] /trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509Credentia...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 27 14:45:28 2012
New Revision: 3109

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3109&view=rev
Log:
Allow for alt name lookup to return null.

Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java?rev=3109&r1=3108&r2=3109&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java Thu Dec 27 14:45:28 2012
@@ -363,12 +363,14 @@
         subjectAltNameTypes.toArray(nameTypes);
         List altNames = X509Support.getAltNames(certificate, nameTypes);
 
-        log.debug("Extracted subject alt names from certificate: {}", altNames);
-
-        for (Object altName : altNames) {
-            if (trustedNames.contains(altName)) {
-                log.debug("Matched subject alt name to trusted names: {}", altName.toString());
-                return true;
+        if (altNames != null) {
+            log.debug("Extracted subject alt names from certificate: {}", altNames);
+    
+            for (Object altName : altNames) {
+                if (trustedNames.contains(altName)) {
+                    log.debug("Matched subject alt name to trusted names: {}", altName.toString());
+                    return true;
+                }
             }
         }
         return false;