Author: coheigea
Date: Thu Jul 2 13:37:39 2009
New Revision: 790586
URL: http://svn.apache.org/viewvc?rev=790586&view=rev
Log:
[WSS-201] - Backporting to 1_5_x-fixes branch.
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/ReferenceListProcessor.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityEncryptionParts.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew3.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityWSS199.java
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
Thu Jul 2 13:37:39 2009
@@ -77,7 +77,11 @@
Vector returnResults,
WSSConfig config
) throws WSSecurityException {
- this.getCertificatesTokenReference(elem, crypto);
+ if (crypto == null) {
+ this.getCertificatesTokenReference(elem, decCrypto);
+ } else {
+ this.getCertificatesTokenReference(elem, crypto);
+ }
returnResults.add(
0,
new WSSecurityEngineResult(WSConstants.BST, this.token,
this.certificates)
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/ReferenceListProcessor.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/ReferenceListProcessor.java
Thu Jul 2 13:37:39 2009
@@ -71,7 +71,7 @@
throw new WSSecurityException(WSSecurityException.FAILURE,
"noCallback");
}
wsDocInfo = wdi;
- ArrayList uris = handleReferenceList(elem, cb, crypto);
+ ArrayList uris = handleReferenceList(elem, cb, decCrypto);
returnResults.add(
0,
new WSSecurityEngineResult(WSConstants.ENCR, uris)
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityEncryptionParts.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityEncryptionParts.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityEncryptionParts.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityEncryptionParts.java
Thu Jul 2 13:37:39 2009
@@ -39,7 +39,6 @@
import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -312,7 +311,7 @@
* @throws Exception Thrown when there is a problem in verification
*/
private Vector verify(Document doc) throws Exception {
- Vector results = secEngine.processSecurityHeader(doc, null, this,
crypto);
+ Vector results = secEngine.processSecurityHeader(doc, null, this,
null, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("Verified and decrypted message:");
String outputString =
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew2.java
Thu Jul 2 13:37:39 2009
@@ -233,7 +233,8 @@
Document doc,
javax.xml.namespace.QName expectedEncryptedElement
) throws Exception {
- final java.util.List results = secEngine.processSecurityHeader(doc,
null, this, crypto);
+ final java.util.List results =
+ secEngine.processSecurityHeader(doc, null, this, null, crypto);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("LogTestService2") > 0 ? true : false);
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew3.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew3.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew3.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityNew3.java
Thu Jul 2 13:37:39 2009
@@ -142,7 +142,7 @@
* @throws java.lang.Exception Thrown when there is a problem in
verification
*/
private void verify(Document doc) throws Exception {
- secEngine.processSecurityHeader(doc, null, this, crypto);
+ secEngine.processSecurityHeader(doc, null, this, crypto, null);
}
public void handle(Callback[] callbacks)
Modified:
webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityWSS199.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityWSS199.java?rev=790586&r1=790585&r2=790586&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityWSS199.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecurityWSS199.java
Thu Jul 2 13:37:39 2009
@@ -29,16 +29,12 @@
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.message.WSSecUsernameToken;
-import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.util.Base64;
import org.w3c.dom.Document;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
-import java.security.MessageDigest;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
