| commit | 16b5592f12ccb841e432f5e16c4851c21ccc66cf | [log] [tgz] |
|---|---|---|
| author | Alex Rudyy <orudyy@apache.org> | Tue Oct 30 15:29:02 2018 +0000 |
| committer | Alex Rudyy <orudyy@apache.org> | Tue Oct 30 16:32:41 2018 +0000 |
| tree | c02ce5efb143657dd67c85f3d541dde87f92ad09 | |
| parent | 4ebae1747328e19519fa670974dfac92fb852a71 [diff] |
QPID-8254: [Broker-J] Stop using illegal ascii characters in java keystore passwords
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 f596a8d..648f9fd 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
@@ -324,7 +324,7 @@ 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);
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 8beaf19..c8a4670 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
@@ -222,7 +222,7 @@ 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);