[java-xmltooling COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xml/security/x509/X509U...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov  2 00:37:20 2012
New Revision: 758

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=758&view=rev
Log:
JXT-93 - Catch SecurityException on keypair match failure.

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/doc/RELEASE-NOTES.txt?rev=758&r1=757&r2=758&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Fri Nov  2 00:37:20 2012
@@ -1,6 +1,7 @@
-Changes in Release 1.3.5
+Changes in Release 1.4.0
 =============================================
 [JXT-88] - AbstractXMLObject unnecessarily creates a new QName in getElementQName
+[JXT-93] - X509Util.determineEntityCertificate doesn't catch lower layer SecurityException
 
 Changes in Release 1.3.4
 =============================================

Modified: branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java?rev=758&r1=757&r2=758&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/security/x509/X509Util.java Fri Nov  2 00:37:20 2012
@@ -118,8 +118,13 @@
         }
 
         for (X509Certificate certificate : certs) {
-            if (SecurityHelper.matchKeyPair(certificate.getPublicKey(), privateKey)) {
-                return certificate;
+            try {
+                if (SecurityHelper.matchKeyPair(certificate.getPublicKey(), privateKey)) {
+                    return certificate;
+                }
+            } catch (SecurityException e) {
+                // An exception here is just a false match.
+                // Java 7 apparently throws in this case.
             }
         }