qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [qpid-jms-amqp-0-x] branch 6.3.x updated: QPID-8281: [JMS AMQP 0-x] Sync client test keystores with broker-j test keystores
Date Wed, 06 Mar 2019 17:48:20 GMT
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


The following commit(s) were added to refs/heads/6.3.x by this push:
     new 6b95bb7  QPID-8281: [JMS AMQP 0-x] Sync client test keystores with broker-j test
keystores
6b95bb7 is described below

commit 6b95bb76780e129d7204d3053d80052c2f628bb2
Author: Alex Rudyy <orudyy@apache.org>
AuthorDate: Wed Mar 6 17:47:53 2019 +0000

    QPID-8281: [JMS AMQP 0-x] Sync client test keystores with broker-j test keystores
---
 .../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 802 -> 1162 bytes
 client/src/test/resources/java_broker_truststore.jks  | Bin 591 -> 1082 bytes
 client/src/test/resources/java_client_keystore.jks    | Bin 5786 -> 7641 bytes
 client/src/test/resources/java_client_truststore.jks  | Bin 591 -> 1082 bytes
 .../test/resources/java_client_untrusted_keystore.jks | Bin 2056 -> 2467 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 293f401..be6da1f 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("JKS");
+            _keyStore = KeyStore.getInstance("pkcs12");
             _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 bbdc3d1..21f7e24 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("JKS");
+            _keyStore = KeyStore.getInstance("pkcs12");
             _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 c728687..0c13cc6 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 = "JKS";
+    private static final String STORE_TYPE = "pkcs12";
     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 3fdfb33..c75b618 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 = "JKS";
+    private static final String STORE_TYPE = "pkcs12";
     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 69cdd40..a5b307f 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 e6d556a..4184adf 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 941fc7e..9422d9a 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 ab79b54..1b45a23 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 45a0c10..8b0b023 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


Mime
View raw message