Author: ruchithf
Date: Sat Oct 7 09:14:14 2006
New Revision: 453951
URL: http://svn.apache.org/viewvc?view=rev&rev=453951
Log:
Use a unique KeyInfo when encrypting mutiple parts
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java?view=diff&rev=453951&r1=453950&r2=453951
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
Sat Oct 7 09:14:14 2006
@@ -75,8 +75,7 @@
return doc;
}
- private Vector doEncryption(Document doc, byte[] secretKey,
- KeyInfo keyInfo, Vector references) throws WSSecurityException {
+ private Vector doEncryption(Document doc, byte[] secretKey, Vector
references) throws WSSecurityException {
SecretKey key = WSSecurityUtil.prepareSecretKey(this.symEncAlgo,
secretKey);
@@ -128,6 +127,15 @@
* xenc:EncryptedData
*/
try {
+ //Create the SecurityTokenRef to the DKT
+ KeyInfo keyInfo = new KeyInfo(document);
+ SecurityTokenReference secToken = new
SecurityTokenReference(document);
+ Reference ref = new Reference(document);
+ ref.setURI("#" + dktId);
+ secToken.setReference(ref);
+
+ keyInfo.addUnknownElement(secToken.getElement());
+
xmlCipher.init(XMLCipher.ENCRYPT_MODE, key);
EncryptedData encData = xmlCipher.getEncryptedData();
encData.setId(xencEncryptedDataId);
@@ -172,16 +180,8 @@
public Element encryptForExternalRef(Element dataRef, Vector references)
throws WSSecurityException {
- //Create the SecurityTokenRef to the DKT
- KeyInfo keyInfo = new KeyInfo(document);
- SecurityTokenReference secToken = new SecurityTokenReference(document);
- Reference ref = new Reference(document);
- ref.setURI("#" + dktId);
- secToken.setReference(ref);
-
- keyInfo.addUnknownElement(secToken.getElement());
- Vector encDataRefs = doEncryption(document, derivedKeyBytes, keyInfo,
+ Vector encDataRefs = doEncryption(document, derivedKeyBytes,
references);
Element referenceList = dataRef;
if (referenceList == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
