Author: coheigea Date: Thu Jul 19 16:16:19 2012 New Revision: 1363410 URL: http://svn.apache.org/viewvc?rev=1363410&view=rev Log: Merged revisions 1363404 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1363404 | coheigea | 2012-07-19 16:59:49 +0100 (Thu, 19 Jul 2012) | 10 lines 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.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java Modified: cxf/branches/2.5.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.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java?rev=1363410&r1=1363409&r2=1363410&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java Thu Jul 19 16:16:19 2012 @@ -191,6 +191,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();
