Repository: qpid-broker-j Updated Branches: refs/heads/7.0.x 196243963 -> cc4821e34
QPID-8254: [Broker-J] Stop using illegal ascii characters in java keystore passwords (cherry picked from commit 16b5592f12ccb841e432f5e16c4851c21ccc66cf) Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/cc4821e3 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/cc4821e3 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/cc4821e3 Branch: refs/heads/7.0.x Commit: cc4821e344a0d23e71a4e4fcc8caf6cd75827c1a Parents: 1962439 Author: Alex Rudyy <[email protected]> Authored: Tue Oct 30 15:29:02 2018 +0000 Committer: Alex Rudyy <[email protected]> Committed: Tue Oct 30 16:37:59 2018 +0000 ---------------------------------------------------------------------- .../qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java | 2 +- .../java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cc4821e3/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java index 66d66e8..fc70468 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java @@ -381,7 +381,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl java.security.KeyStore inMemoryKeyStore = java.security.KeyStore.getInstance(java.security.KeyStore.getDefaultType()); byte[] bytes = new byte[64]; - char[] chars = new char[64]; + char[] chars = "".toCharArray(); RANDOM.nextBytes(bytes); StandardCharsets.US_ASCII.decode(ByteBuffer.wrap(bytes)).get(chars); inMemoryKeyStore.load(null, chars); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cc4821e3/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java index ff84694..6700cc9 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java @@ -228,7 +228,7 @@ public class NonJavaKeyStoreImpl extends AbstractKeyStore<NonJavaKeyStoreImpl> i java.security.KeyStore inMemoryKeyStore = java.security.KeyStore.getInstance(java.security.KeyStore.getDefaultType()); byte[] bytes = new byte[64]; - char[] chars = new char[64]; + char[] chars = "".toCharArray(); RANDOM.nextBytes(bytes); StandardCharsets.US_ASCII.decode(ByteBuffer.wrap(bytes)).get(chars); inMemoryKeyStore.load(null, chars); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
