This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
The following commit(s) were added to refs/heads/master by this push:
new 2b8edbe QPID-8281: [JMS AMQP 0-x] Use correct kystore type in tests
2b8edbe is described below
commit 2b8edbeadc4f7f50f3cd07ec5a544dd8ca00417d
Author: Alex Rudyy <oru...@apache.org>
AuthorDate: Wed Mar 6 17:57:19 2019 +0000
QPID-8281: [JMS AMQP 0-x] Use correct kystore type in tests
---
.../org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java | 2 +-
.../org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java | 2 +-
client/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java | 2 +-
3 files changed, 3 insertions(+), 3 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
