QPID-8281: [JMS AMQP 0-x] Use correct kystore type in tests
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 @@
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 @@
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 @@
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();
