svn commit: r1363404 - /cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java

[coheigea]

Author: coheigea
Date: Thu Jul 19 15:59:49 2012
New Revision: 1363404

URL: http://svn.apache.org/viewvc?rev=1363404&view=rev
Log:
Merged revisions 1363394 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1363394 | coheigea | 2012-07-19 16:51:43 +0100 (Thu, 19 Jul 2012) | 2 lines

  [CXF-4436] - EncryptionProperties.keyWrapAlgorithm is not used when issuing a 
Symmetric HOK SAML Assertion

........

Modified:
    
cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java

Modified: 
cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java?rev=1363404&r1=1363403&r2=1363404&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
 Thu Jul 19 15:59:49 2012
@@ -211,6 +211,7 @@ public class DefaultSubjectProvider impl
         encrKey.setEphemeralKey(secret);
         
encrKey.setSymmetricEncAlgorithm(encryptionProperties.getEncryptionAlgorithm());
         encrKey.setUseThisCert(certificate);
+        encrKey.setKeyEncAlgo(encryptionProperties.getKeyWrapAlgorithm());
         encrKey.prepare(doc, encryptionCrypto);
         Element encryptedKeyElement = encrKey.getEncryptedKeyElement();