You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/05/09 16:48:35 UTC
[qpid-jms-amqp-0-x] 01/03: NO-JIRA: Convert pksc12 keystore into
jks format due to limitation of java7 not allowing a trustedCert entry in a
PKCS12 keystore
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 6.3.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 0568698adc1691248926bc488cf4f5afd08c8e0e
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Thu May 9 17:35:40 2019 +0100
NO-JIRA: Convert pksc12 keystore into jks format due to limitation of java7 not allowing a trustedCert entry in a PKCS12 keystore
---
.../message/Encrypted010MessageFactoryTest.java | 2 +-
.../message/Encrypted091MessageFactoryTest.java | 2 +-
.../org/apache/qpid/ssl/SSLContextFactoryTest.java | 2 +-
.../java/org/apache/qpid/ssl/TrustManagerTest.java | 2 +-
client/src/test/resources/java_broker_peerstore.jks | Bin 1162 -> 931 bytes
client/src/test/resources/java_broker_truststore.jks | Bin 1082 -> 852 bytes
client/src/test/resources/java_client_keystore.jks | Bin 7641 -> 6832 bytes
client/src/test/resources/java_client_truststore.jks | Bin 1082 -> 852 bytes
.../test/resources/java_client_untrusted_keystore.jks | Bin 2467 -> 2093 bytes
9 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
index be6da1f..4815723 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
@@ -95,7 +95,7 @@ public class Encrypted010MessageFactoryTest extends QpidTestCase
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new IvParameterSpec(_initializeVector));
_encryptedMessage = cipher.doFinal(_unencrypted);
- _keyStore = KeyStore.getInstance("pkcs12");
+ _keyStore = KeyStore.getInstance("jks");
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
index 21f7e24..7af4e63 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
@@ -88,7 +88,7 @@ public class Encrypted091MessageFactoryTest extends QpidTestCase
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new IvParameterSpec(_initializeVector));
_encryptedMessage = cipher.doFinal(_unencrypted);
- _keyStore = KeyStore.getInstance("pkcs12");
+ _keyStore = KeyStore.getInstance("jks");
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
diff --git a/client/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java b/client/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
index 0c13cc6..97990ad 100644
--- a/client/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
@@ -30,7 +30,7 @@ import java.io.IOException;
public class SSLContextFactoryTest extends QpidTestCase
{
- private static final String STORE_TYPE = "pkcs12";
+ private static final String STORE_TYPE = "jks";
private static final String DEFAULT_KEY_MANAGER_ALGORITHM = KeyManagerFactory.getDefaultAlgorithm();
private static final String DEFAULT_TRUST_MANAGER_ALGORITHM = TrustManagerFactory.getDefaultAlgorithm();
diff --git a/client/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java b/client/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
index c75b618..0019a9e 100644
--- a/client/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
+++ b/client/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
@@ -38,7 +38,7 @@ import org.apache.qpid.transport.network.security.ssl.SSLUtil;
public class TrustManagerTest extends QpidTestCase
{
- private static final String STORE_TYPE = "pkcs12";
+ private static final String STORE_TYPE = "jks";
private static final String DEFAULT_TRUST_MANAGER_ALGORITHM = TrustManagerFactory.getDefaultAlgorithm();
// retrieves the client certificate's chain from store and returns it as an array
diff --git a/client/src/test/resources/java_broker_peerstore.jks b/client/src/test/resources/java_broker_peerstore.jks
index a5b307f..d2c9b3b 100644
Binary files a/client/src/test/resources/java_broker_peerstore.jks and b/client/src/test/resources/java_broker_peerstore.jks differ
diff --git a/client/src/test/resources/java_broker_truststore.jks b/client/src/test/resources/java_broker_truststore.jks
index 4184adf..eaec534 100644
Binary files a/client/src/test/resources/java_broker_truststore.jks and b/client/src/test/resources/java_broker_truststore.jks differ
diff --git a/client/src/test/resources/java_client_keystore.jks b/client/src/test/resources/java_client_keystore.jks
index 9422d9a..0cc83a9 100644
Binary files a/client/src/test/resources/java_client_keystore.jks and b/client/src/test/resources/java_client_keystore.jks differ
diff --git a/client/src/test/resources/java_client_truststore.jks b/client/src/test/resources/java_client_truststore.jks
index 1b45a23..06876fa 100644
Binary files a/client/src/test/resources/java_client_truststore.jks and b/client/src/test/resources/java_client_truststore.jks differ
diff --git a/client/src/test/resources/java_client_untrusted_keystore.jks b/client/src/test/resources/java_client_untrusted_keystore.jks
index 8b0b023..eb8d310 100644
Binary files a/client/src/test/resources/java_client_untrusted_keystore.jks and b/client/src/test/resources/java_client_untrusted_keystore.jks differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org