Author: coheigea
Date: Fri Jan 21 16:22:36 2011
New Revision: 1061879

URL: http://svn.apache.org/viewvc?rev=1061879&view=rev
Log:
[WSS-146] - Some changes to get the test source to compile with JDK 1.5
 - Also changed how the assertions are parsed - signed assertions are now saved 
with action WSConstants.ST_SIGNED, and unsigned assertions with 
WSConstants.ST_UNSIGNED, where "signed" refers to an enveloped signature.

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSConstants.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSConstants.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSConstants.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSConstants.java 
(original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSConstants.java 
Fri Jan 21 16:22:36 2011
@@ -397,11 +397,6 @@ public class WSConstants {
     public static final int SIGN = 0x2; // Perform Signature
     public static final int ENCR = 0x4; // Perform Encryption
 
-    /*
-     * Attention: the signed/Unsigned types identify if WSS4J uses
-     * the SAML token for signature, signature key or not. It does
-     * not mean if the token contains an enveloped signature.
-     */
     public static final int ST_UNSIGNED = 0x8; // perform SAMLToken unsigned
     public static final int ST_SIGNED = 0x10; // perform SAMLToken signed
 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 Fri Jan 21 16:22:36 2011
@@ -51,8 +51,12 @@ public class SAMLTokenProcessor implemen
         }
         AssertionWrapper assertion = handleSAMLToken(elem, crypto);
         wsDocInfo.addTokenElement(elem);
-        WSSecurityEngineResult result = 
-            new WSSecurityEngineResult(WSConstants.ST_UNSIGNED, assertion);
+        WSSecurityEngineResult result = null;
+        if (assertion.isSigned()) {
+            result = new WSSecurityEngineResult(WSConstants.ST_SIGNED, 
assertion);
+        } else {
+            result = new WSSecurityEngineResult(WSConstants.ST_UNSIGNED, 
assertion);
+        }
         String id = assertion.getId();
         result.put(WSSecurityEngineResult.TAG_ID, id);
         wsDocInfo.addResult(result);
@@ -64,7 +68,9 @@ public class SAMLTokenProcessor implemen
         Crypto crypto
     ) throws WSSecurityException {
         AssertionWrapper assertion = new AssertionWrapper(token);
-        assertion.verify(crypto);
+        if (assertion.isSigned()) {
+            assertion.verify(crypto);
+        }
         if (log.isDebugEnabled()) {
             log.debug("SAML Assertion issuer " + assertion.getIssuerString());
             log.debug(DOM2Writer.nodeToString(token));

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
 Fri Jan 21 16:22:36 2011
@@ -99,7 +99,7 @@ public class DerivedKeyTokenSTRParser im
                 secretKey = 
(byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
             } else if (WSConstants.SCT == action) {
                 secretKey = 
(byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-            } else if (WSConstants.ST_UNSIGNED == action) {
+            } else if (WSConstants.ST_UNSIGNED == action || 
WSConstants.ST_SIGNED == action) {
                 AssertionWrapper assertion = 
                     
(AssertionWrapper)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
                 SAMLKeyInfo keyInfo = 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
 Fri Jan 21 16:22:36 2011
@@ -113,7 +113,7 @@ public class EncryptedKeySTRParser imple
                             (X509Certificate[])result.get(
                                 WSSecurityEngineResult.TAG_X509_CERTIFICATES
                             );
-                    } else if (WSConstants.ST_UNSIGNED == action) {
+                    } else if (WSConstants.ST_UNSIGNED == action || 
WSConstants.ST_SIGNED == action) {
                         AssertionWrapper assertion = 
                             
(AssertionWrapper)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
                         SAMLKeyInfo keyInfo = 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
 Fri Jan 21 16:22:36 2011
@@ -94,7 +94,7 @@ public class SecurityTokenRefSTRParser i
                         (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
                     String algorithm = 
(String)parameters.get(SIGNATURE_METHOD);
                     secretKey = 
dkt.deriveKey(WSSecurityUtil.getKeyLength(algorithm), secret);
-                } else if (WSConstants.ST_UNSIGNED == action) {
+                } else if (WSConstants.ST_UNSIGNED == action || 
WSConstants.ST_SIGNED == action) {
                     AssertionWrapper assertion = 
                         
(AssertionWrapper)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
                     SAMLKeyInfo keyInfo = 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
 Fri Jan 21 16:22:36 2011
@@ -181,7 +181,7 @@ public class SignatureSTRParser implemen
                     byte[] secret = 
(byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
                     secretKey = dkt.deriveKey(keyLength, secret); 
                     principal = dkt.createPrincipal();
-                } else if (WSConstants.ST_UNSIGNED == action) {
+                } else if (WSConstants.ST_UNSIGNED == action || 
WSConstants.ST_SIGNED == action) {
                     if (crypto == null) {
                         throw new WSSecurityException(
                             WSSecurityException.FAILURE, "noSigCryptoFile"

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
 Fri Jan 21 16:22:36 2011
@@ -60,7 +60,7 @@ public class SAML1CallbackHandler extend
                         KeyInfoBean keyInfo = createKeyInfo();
                         subjectBean.setKeyInfo(keyInfo);
                     } catch (Exception ex) {
-                        throw new IOException("Problem creating KeyInfo", ex);
+                        throw new IOException("Problem creating KeyInfo: " +  
ex.getMessage());
                     }
                 }
                 createAndSetStatement(subjectBean, callback);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
 Fri Jan 21 16:22:36 2011
@@ -59,7 +59,7 @@ public class SAML2CallbackHandler extend
                         KeyInfoBean keyInfo = createKeyInfo();
                         subjectBean.setKeyInfo(keyInfo);
                     } catch (Exception ex) {
-                        throw new IOException("Problem creating KeyInfo", ex);
+                        throw new IOException("Problem creating KeyInfo: " +  
ex.getMessage());
                     }
                 }
                 callback.setSubject(subjectBean);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
 Fri Jan 21 16:22:36 2011
@@ -209,7 +209,7 @@ public class SignaturePartsTest extends 
         List<WSSecurityEngineResult> results = 
             secEngine.processSecurityHeader(doc, null, null, trustCrypto);
         WSSecurityEngineResult stUnsignedActionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
stUnsignedActionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
 Fri Jan 21 16:22:36 2011
@@ -250,7 +250,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, 
null);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -316,7 +316,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, 
null);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -445,7 +445,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(doc, trustCrypto, 
userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -524,7 +524,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(doc, trustCrypto, 
userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -712,7 +712,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, 
null);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -779,7 +779,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto, 
null);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -857,7 +857,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(doc, trustCrypto, 
userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -936,7 +936,7 @@ public class SamlReferenceTest extends o
         
         List<WSSecurityEngineResult> results = verify(doc, trustCrypto, 
userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
 Fri Jan 21 16:22:36 2011
@@ -87,7 +87,7 @@ public class SamlTokenHOKTest extends or
         
         List<WSSecurityEngineResult> results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -120,7 +120,7 @@ public class SamlTokenHOKTest extends or
         
         List<WSSecurityEngineResult> results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -161,7 +161,7 @@ public class SamlTokenHOKTest extends or
         
         List<WSSecurityEngineResult> results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -203,7 +203,7 @@ public class SamlTokenHOKTest extends or
         
         List<WSSecurityEngineResult> results = verify(unsignedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -245,7 +245,7 @@ public class SamlTokenHOKTest extends or
         
         List<WSSecurityEngineResult> results = verify(unsignedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java?rev=1061879&r1=1061878&r2=1061879&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
 Fri Jan 21 16:22:36 2011
@@ -125,7 +125,7 @@ public class SignedSamlTokenHOKTest exte
         
         // Test we processed a SAML assertion
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -180,7 +180,7 @@ public class SignedSamlTokenHOKTest exte
         
         // Test we processed a SAML assertion
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -243,7 +243,7 @@ public class SignedSamlTokenHOKTest exte
         
         // Test we processed a SAML assertion
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -308,7 +308,7 @@ public class SignedSamlTokenHOKTest exte
         
         // Test we processed a SAML assertion
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -374,7 +374,7 @@ public class SignedSamlTokenHOKTest exte
         
         // Test we processed a SAML assertion
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -437,7 +437,7 @@ public class SignedSamlTokenHOKTest exte
         
         List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -500,7 +500,7 @@ public class SignedSamlTokenHOKTest exte
         
         List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
@@ -563,7 +563,7 @@ public class SignedSamlTokenHOKTest exte
         
         List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
         AssertionWrapper receivedAssertion = 
             (AssertionWrapper) 
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);


Reply via email to