You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/03/11 16:43:33 UTC

svn commit: r1080615 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security: processor/BinarySecurityTokenProcessor.java saml/WSSecSignatureSAML.java

Author: coheigea
Date: Fri Mar 11 15:43:32 2011
New Revision: 1080615

URL: http://svn.apache.org/viewvc?rev=1080615&view=rev
Log:
Added a NPE guard and removed an erroneous key identifier check for SAML.

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java?rev=1080615&r1=1080614&r2=1080615&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java Fri Mar 11 15:43:32 2011
@@ -91,6 +91,9 @@ public class BinarySecurityTokenProcesso
      */
     private X509Certificate[] getCertificatesTokenReference(BinarySecurity token, Crypto crypto)
         throws WSSecurityException {
+        if (crypto == null) {
+            throw new WSSecurityException(WSSecurityException.FAILURE, "noSigCryptoFile");
+        }
         if (token instanceof PKIPathSecurity) {
             return ((PKIPathSecurity) token).getX509Certificates(crypto);
         } else if (token instanceof X509Security) {

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=1080615&r1=1080614&r2=1080615&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java Fri Mar 11 15:43:32 2011
@@ -382,15 +382,6 @@ public class WSSecSignatureSAML extends 
             );
         }
         
-        //
-        // Test the keyIdentiferType - It must be a BST Direct Reference or an 
-        // X.509 Key Identifier
-        //
-        if (keyIdentifierType != WSConstants.X509_KEY_IDENTIFIER &&
-            keyIdentifierType != WSConstants.BST_DIRECT_REFERENCE) {
-            keyIdentifierType = WSConstants.X509_KEY_IDENTIFIER;
-        }
-
         if (senderVouches) {
             switch (keyIdentifierType) {
             case WSConstants.BST_DIRECT_REFERENCE: