You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2014/01/10 17:37:42 UTC

svn commit: r1557182 - /santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java

Author: coheigea
Date: Fri Jan 10 16:37:41 2014
New Revision: 1557182

URL: http://svn.apache.org/r1557182
Log:
A fix for the Encryption IssuerSerial case

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1557182&r1=1557181&r2=1557182&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java Fri Jan 10 16:37:41 2014
@@ -165,7 +165,10 @@ public class SecurityTokenFactoryImpl ex
         if (issuerSerialType != null) {
             if (issuerSerialType.getX509IssuerName() == null
                     || issuerSerialType.getX509SerialNumber() == null
-                    || securityProperties.getSignatureVerificationKey() == null) {
+                    || SecurityTokenConstants.KeyUsage_Signature_Verification.equals(keyUsage)
+                        && securityProperties.getSignatureVerificationKey() == null
+                    || SecurityTokenConstants.KeyUsage_Decryption.equals(keyUsage)
+                        && securityProperties.getDecryptionKey() == null) {
                 throw new XMLSecurityException("stax.noKey", keyUsage);
             }
             X509IssuerSerialSecurityToken token =