Updating WSS4J # Conflicts: # parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e2351a7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e2351a7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e2351a7 Branch: refs/heads/3.0.x-fixes Commit: 2e2351a7b5749ce16ea77504190447e35a6dac1e Parents: becfc95 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Mar 14 15:26:55 2016 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Mar 14 16:48:16 2016 +0000 ---------------------------------------------------------------------- .../src/main/java/demo/wssec/client/StaxClient.java | 2 +- .../src/main/java/demo/wssec/server/StaxServer.java | 2 +- parent/pom.xml | 2 +- .../policy/custom/DefaultAlgorithmSuiteLoader.java | 12 ++++++------ .../apache/cxf/sts/service/EncryptionProperties.java | 6 +++--- .../cxf/sts/operation/IssueEncryptedUnitTest.java | 4 ++-- .../org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java index 9a96359..d64aa0d 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java @@ -92,7 +92,7 @@ public final class StaxClient { properties.setSignatureCryptoProperties(sigCryptoProperties); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference + WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE ); properties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#rsa-sha1";); properties.addSignaturePart( http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java index 7559434..0d10e4a 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java @@ -88,7 +88,7 @@ public class StaxServer { properties.setSignatureCryptoProperties(decCryptoProperties); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference + WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE ); properties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#rsa-sha1";); properties.addSignaturePart( http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 376e58d..a06475f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -164,7 +164,7 @@ <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> - <cxf.wss4j.version>2.0.6</cxf.wss4j.version> + <cxf.wss4j.version>2.0.7-SNAPSHOT</cxf.wss4j.version> <cxf.xerces.version>2.11.0</cxf.xerces.version> <cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version> <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java index d7cea7b..15b3959 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java @@ -71,7 +71,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { public static class GCMAlgorithmSuite extends AlgorithmSuite { static { - algorithmSuiteTypes.put( + ALGORITHM_SUITE_TYPES.put( "Basic128GCM", new AlgorithmSuiteType( "Basic128GCM", @@ -85,7 +85,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { ) ); - algorithmSuiteTypes.put( + ALGORITHM_SUITE_TYPES.put( "Basic192GCM", new AlgorithmSuiteType( "Basic192GCM", @@ -99,7 +99,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { ) ); - algorithmSuiteTypes.put( + ALGORITHM_SUITE_TYPES.put( "Basic256GCM", new AlgorithmSuiteType( "Basic256GCM", @@ -132,13 +132,13 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader { } if ("Basic128GCM".equals(assertionName)) { - setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic128GCM")); + setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic128GCM")); getAlgorithmSuiteType().setNamespace(assertionNamespace); } else if ("Basic192GCM".equals(assertionName)) { - setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic192GCM")); + setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic192GCM")); getAlgorithmSuiteType().setNamespace(assertionNamespace); } else if ("Basic256GCM".equals(assertionName)) { - setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic256GCM")); + setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic256GCM")); getAlgorithmSuiteType().setNamespace(assertionNamespace); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java index 6fbc093..ba8b25b 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/service/EncryptionProperties.java @@ -30,7 +30,7 @@ import org.apache.wss4j.dom.WSConstants; */ public class EncryptionProperties { private String encryptionAlgorithm = WSConstants.AES_256; - private String keyWrapAlgorithm = WSConstants.KEYTRANSPORT_RSAOEP; + private String keyWrapAlgorithm = WSConstants.KEYTRANSPORT_RSAOAEP; private int keyIdentifierType = WSConstants.ISSUER_SERIAL; private List<String> acceptedEncryptionAlgorithms = new ArrayList<String>(); private List<String> acceptedKeyWrapAlgorithms = new ArrayList<String>(); @@ -48,7 +48,7 @@ public class EncryptionProperties { // Default key wrap algorithms acceptedKeyWrapAlgorithms.add(WSConstants.KEYTRANSPORT_RSA15); - acceptedKeyWrapAlgorithms.add(WSConstants.KEYTRANSPORT_RSAOEP); + acceptedKeyWrapAlgorithms.add(WSConstants.KEYTRANSPORT_RSAOAEP); } /** @@ -143,4 +143,4 @@ public class EncryptionProperties { return acceptedKeyWrapAlgorithms; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java index c399543..5b38f6e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java @@ -334,7 +334,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { if (!unrestrictedPoliciesInstalled) { encryptionProperties.setEncryptionAlgorithm(WSConstants.AES_128); } - encryptionProperties.setKeyWrapAlgorithm(WSConstants.KEYTRANSPORT_RSAOEP); + encryptionProperties.setKeyWrapAlgorithm(WSConstants.KEYTRANSPORT_RSAOAEP); service.setEncryptionProperties(encryptionProperties); issueOperation.setServices(Collections.singletonList(service)); @@ -424,7 +424,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy";)); JAXBElement<String> encryptionAlgorithmType = new JAXBElement<String>( - QNameConstants.KEYWRAP_ALGORITHM, String.class, WSConstants.KEYTRANSPORT_RSAOEP + QNameConstants.KEYWRAP_ALGORITHM, String.class, WSConstants.KEYTRANSPORT_RSAOAEP ); request.getAny().add(encryptionAlgorithmType); http://git-wip-us.apache.org/repos/asf/cxf/blob/2e2351a7/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java index cc3c971..41440b2 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java @@ -829,7 +829,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { WSSecEncryptedKey builder = new WSSecEncryptedKey(); builder.setUserInfo("mystskey"); builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP); + builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP); Document doc = DOMUtils.createDocument(); builder.prepare(doc, stsProperties.getSignatureCrypto());
