You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/11/23 12:54:10 UTC

svn commit: r1412844 - in /cxf/trunk/services/sts: sts-core/src/main/java/org/apache/cxf/sts/service/ sts-war/src/main/webapp/WEB-INF/wsdl/ systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ systests/advanced/src/test/reso...

Author: coheigea
Date: Fri Nov 23 11:54:04 2012
New Revision: 1412844

URL: http://svn.apache.org/viewvc?rev=1412844&view=rev
Log:
Switching STS to use RSA-OAEP as the default key wrapping algorithm

Modified:
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java
    cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/ws-trust-1.4-service.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItNoClaims.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItWrongClaims.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java (original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java Fri Nov 23 11:54:04 2012
@@ -30,7 +30,7 @@ import org.apache.ws.security.WSConstant
  */
 public class EncryptionProperties {
     private String encryptionAlgorithm = WSConstants.AES_256;
-    private String keyWrapAlgorithm = WSConstants.KEYTRANSPORT_RSA15;
+    private String keyWrapAlgorithm = WSConstants.KEYTRANSPORT_RSAOEP;
     private int keyIdentifierType = WSConstants.ISSUER_SERIAL;
     private List<String> acceptedEncryptionAlgorithms = new ArrayList<String>();
     private List<String> acceptedKeyWrapAlgorithms = new ArrayList<String>();

Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl Fri Nov 23 11:54:04 2012
@@ -579,7 +579,7 @@
                   </sp:RecipientToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -629,7 +629,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl Fri Nov 23 11:54:04 2012
@@ -207,7 +207,7 @@
                   </sp:RecipientToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -67,7 +67,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/ws-trust-1.4-service.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/ws-trust-1.4-service.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/ws-trust-1.4-service.wsdl Fri Nov 23 11:54:04 2012
@@ -282,7 +282,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -114,7 +114,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -195,7 +195,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -165,7 +165,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -240,7 +240,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -287,7 +287,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -397,7 +397,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItNoClaims.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItNoClaims.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItNoClaims.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItNoClaims.wsdl Fri Nov 23 11:54:04 2012
@@ -71,7 +71,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItWrongClaims.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItWrongClaims.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItWrongClaims.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleItWrongClaims.wsdl Fri Nov 23 11:54:04 2012
@@ -121,7 +121,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -168,7 +168,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -70,7 +70,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -70,7 +70,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl Fri Nov 23 11:54:04 2012
@@ -279,7 +279,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -329,7 +329,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -112,7 +112,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -188,7 +188,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -264,7 +264,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -70,7 +70,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -82,7 +82,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -112,7 +112,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -188,7 +188,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -264,7 +264,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -94,7 +94,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -70,7 +70,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -70,7 +70,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -71,7 +71,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -91,7 +91,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -190,7 +190,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -92,7 +92,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -151,7 +151,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl?rev=1412844&r1=1412843&r2=1412844&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl Fri Nov 23 11:54:04 2012
@@ -135,7 +135,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -205,7 +205,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -251,7 +251,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>