Author: ruchithf
Date: Tue Sep 12 13:17:55 2006
New Revision: 442692
URL: http://svn.apache.org/viewvc?view=rev&rev=442692
Log:
Enabled WSSecEncrypt to work with an enxternally provided ephemeral key
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.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?view=diff&rev=442692&r1=442691&r2=442692
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
Tue Sep 12 13:17:55 2006
@@ -190,12 +190,14 @@
* encrypted using the public key of the receiver
*/
- if (symmetricKey == null) {
- KeyGenerator keyGen = getKeyGenerator();
- this.symmetricKey = keyGen.generateKey();
+
+ if(this.ephemeralKey == null) {
+ if (symmetricKey == null) {
+ KeyGenerator keyGen = getKeyGenerator();
+ this.symmetricKey = keyGen.generateKey();
+ }
+ this.ephemeralKey = this.symmetricKey.getEncoded();
}
- byte[] encKey = this.symmetricKey.getEncoded();
-
/*
* Get the certificate that contains the public key for the public key
* algorithm that will encrypt the generated symmetric (session) key.
@@ -211,7 +213,7 @@
}
remoteCert = certs[0];
}
- prepareInternal(encKey, remoteCert, crypto);
+ prepareInternal(this.ephemeralKey, remoteCert, crypto);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
