Author: coheigea
Date: Tue Jun 23 14:25:49 2015
New Revision: 1687076
URL: http://svn.apache.org/r1687076
Log:
Fixing a bug when not encrypting the symmetric encryption key
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1687076&r1=1687075&r2=1687076&view=diff
==============================================================================
---
webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
Tue Jun 23 14:25:49 2015
@@ -669,7 +669,19 @@ public class WSSecEncrypt extends WSSecE
secToken.addTokenType(WSConstants.WSS_ENC_KEY_VALUE_TYPE);
}
keyInfo.addUnknownElement(secToken.getElement());
+ } else if (!encryptSymmKey && keyIdentifierType ==
WSConstants.ISSUER_SERIAL) {
+ SecurityTokenReference secToken = new
SecurityTokenReference(document);
+ secToken.addWSSENamespace();
+ if (customReferenceValue != null) {
+ secToken.setKeyIdentifierEncKeySHA1(customReferenceValue);
+ } else {
+ byte[] encodedBytes =
KeyUtils.generateDigest(encryptedEphemeralKey);
+
secToken.setKeyIdentifierEncKeySHA1(Base64.encode(encodedBytes));
+ }
+ secToken.addTokenType(WSConstants.WSS_ENC_KEY_VALUE_TYPE);
+ keyInfo.addUnknownElement(secToken.getElement());
}
+
Element keyInfoElement = keyInfo.getElement();
keyInfoElement.setAttributeNS(
WSConstants.XMLNS_NS, "xmlns:" + WSConstants.SIG_PREFIX,
WSConstants.SIG_NS
