resolve cherry-pick conflicts
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/23408fdb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/23408fdb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/23408fdb Branch: refs/heads/3.0.x-fixes Commit: 23408fdbbd30dc1836d60c72bf93ffb215504cdd Parents: f495527 Author: Freeman Fang <freeman.f...@gmail.com> Authored: Wed Jun 14 12:42:09 2017 +0800 Committer: Freeman Fang <freeman.f...@gmail.com> Committed: Wed Jun 14 12:42:09 2017 +0800 ---------------------------------------------------------------------- .../configuration/jsse/TLSParameterJaxBUtils.java | 7 ++++--- .../src/test/resources/keys/MultipleKeys.jks | Bin 0 -> 4391 bytes testutils/src/test/resources/keys/MultipleKeys.jks | Bin 4391 -> 0 bytes 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/23408fdb/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java index 18b0228..cdb4a9e 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java @@ -293,19 +293,20 @@ public final class TLSParameterJaxBUtils { throws GeneralSecurityException, IOException { - KeyStore keyStore = getKeyStore(kmc.getKeyStore(), false); + KeyStore keyStore = getKeyStore(kmc.getKeyStore()); String alg = kmc.isSetFactoryAlgorithm() ? kmc.getFactoryAlgorithm() : KeyManagerFactory.getDefaultAlgorithm(); - char[] keyPass = getKeyPassword(kmc); + char[] keyPass = kmc.isSetKeyPassword() + ? deobfuscate(kmc.getKeyPassword()) + : null; KeyManagerFactory fac = kmc.isSetProvider() ? KeyManagerFactory.getInstance(alg, kmc.getProvider()) : KeyManagerFactory.getInstance(alg); - try { fac.init(keyStore, keyPass); http://git-wip-us.apache.org/repos/asf/cxf/blob/23408fdb/systests/transports/src/test/resources/keys/MultipleKeys.jks ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/keys/MultipleKeys.jks b/systests/transports/src/test/resources/keys/MultipleKeys.jks new file mode 100644 index 0000000..9e6c477 Binary files /dev/null and b/systests/transports/src/test/resources/keys/MultipleKeys.jks differ http://git-wip-us.apache.org/repos/asf/cxf/blob/23408fdb/testutils/src/test/resources/keys/MultipleKeys.jks ---------------------------------------------------------------------- diff --git a/testutils/src/test/resources/keys/MultipleKeys.jks b/testutils/src/test/resources/keys/MultipleKeys.jks deleted file mode 100644 index 9e6c477..0000000 Binary files a/testutils/src/test/resources/keys/MultipleKeys.jks and /dev/null differ
