Repository: cxf Updated Branches: refs/heads/master e510d3e8d -> d26570e26
Fixing compilation errors following WSS4J changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d26570e2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d26570e2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d26570e2 Branch: refs/heads/master Commit: d26570e26de80d0e0c6870ae5d959bfc8c0d19e4 Parents: e510d3e Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Mar 1 11:03:34 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Mar 1 11:03:34 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java | 4 ++-- .../java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 2 +- .../apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d26570e2/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 a8ef79a..f0ffb8b 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 @@ -329,7 +329,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)); @@ -418,7 +418,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/d26570e2/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 4231365..e4fc41d 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 @@ -828,7 +828,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()); http://git-wip-us.apache.org/repos/asf/cxf/blob/d26570e2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java index 6b05a2a..434b760 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java @@ -80,7 +80,7 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader { SPConstants.SHA1, "http://www.w3.org/2009/xmlenc11#aes256-gcm";, SPConstants.KW_AES256, - WSConstants.KEYTRANSPORT_RSAOEP_XENC11, + WSConstants.KEYTRANSPORT_RSAOAEP_XENC11, SPConstants.P_SHA1_L256, SPConstants.P_SHA1_L192, 256, 192, 256, 256, 1024, 4096
