Author: coheigea
Date: Tue Apr 14 15:53:37 2009
New Revision: 764849
URL: http://svn.apache.org/viewvc?rev=764849&view=rev
Log:
[WSS-173] - Fixed bug introduced by recent optimisations which was exposed by
WCF interop testing (only applies on trunk)
- Also removed WSSecEncryptedKey always setting the xenc namespace needlessly
on the SOAP envelope.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=764849&r1=764848&r2=764849&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
Tue Apr 14 15:53:37 2009
@@ -565,6 +565,7 @@
encData.setKeyInfo(keyInfo);
xmlCipher.doFinal(doc, body, content);
+ keyInfo = new KeyInfo((Element)
keyInfo.getElement().cloneNode(true), null);
} catch (Exception e2) {
throw new WSSecurityException(
WSSecurityException.FAILED_ENCRYPTION, null, null, e2
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=764849&r1=764848&r2=764849&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
Tue Apr 14 15:53:37 2009
@@ -301,9 +301,6 @@
xencCipherValue.appendChild(keyText);
envelope = document.getDocumentElement();
- envelope.setAttributeNS(
- WSConstants.XMLNS_NS, "xmlns:" + WSConstants.ENC_PREFIX,
WSConstants.ENC_NS
- );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
