Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b16f63b2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b16f63b2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b16f63b2 Branch: refs/heads/3.1.x-fixes Commit: b16f63b29a864f3687932f9e664088b79f3c40e9 Parents: 4bca17b Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Apr 5 12:49:57 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Apr 5 12:49:57 2017 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b16f63b2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java index c2699fc..972a9fd 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/DefaultSTSTokenCacher.java @@ -21,7 +21,6 @@ package org.apache.cxf.ws.security.trust; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Base64; import java.util.HashMap; import java.util.Map; @@ -38,6 +37,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; +import org.apache.xml.security.utils.Base64; public class DefaultSTSTokenCacher implements STSTokenCacher { @@ -197,7 +197,7 @@ public class DefaultSTSTokenCacher implements STSTokenCacher { try { MessageDigest digest = MessageDigest.getInstance("SHA-256"); byte[] bytes = digest.digest(text.getBytes()); - return Base64.getMimeEncoder().encodeToString(bytes); + return Base64.encode(bytes); } catch (NoSuchAlgorithmException e) { // SHA-256 must be supported so not going to happen... }
