You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/09/02 18:59:03 UTC
qpid-proton git commit: PROTON-1224,
PROTON-1295: fix recent change to ensure method is invoked on the
converter,
add additional keyfile+test to ensure tests really do exercise that codepath
Repository: qpid-proton
Updated Branches:
refs/heads/master 722226285 -> 21b0b76d0
PROTON-1224, PROTON-1295: fix recent change to ensure method is invoked on the converter, add additional keyfile+test to ensure tests really do exercise that codepath
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/21b0b76d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/21b0b76d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/21b0b76d
Branch: refs/heads/master
Commit: 21b0b76d0ee070bb5b5d37434694988a6dd28dc8
Parents: 7222262
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Sep 2 19:55:29 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Sep 2 19:55:53 2016 +0100
----------------------------------------------------------------------
.../engine/impl/ssl/SslEngineFacadeFactory.java | 2 +-
.../impl/ssl/SslEngineFacadeFactoryTest.java | 10 ++++++-
.../qpid/proton/engine/impl/ssl/README.txt | 8 ++++++
.../impl/ssl/private-key-clear-pkcs8.pem.txt | 28 ++++++++++++++++++++
4 files changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/21b0b76d/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
index 20daa64..f6346aa 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
@@ -486,7 +486,7 @@ public class SslEngineFacadeFactory
else if (PrivateKeyInfoClass.isInstance(pemObject))
{
// It's an unencrypted private key
- privateKey = (PrivateKey) getPrivateKeyMethod.invoke(pemObject);
+ privateKey = (PrivateKey) getPrivateKeyMethod.invoke(keyConverter, pemObject);
}
else
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/21b0b76d/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
----------------------------------------------------------------------
diff --git a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
index 5728c5c..84ba8cb 100644
--- a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
+++ b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
@@ -49,7 +49,15 @@ public class SslEngineFacadeFactoryTest {
String keyFile = resolveFilename("private-key-clear.pem.txt");
SslEngineFacadeFactory factory = new SslEngineFacadeFactory();
- assertNotNull("Key was NULL", factory.readPrivateKey(keyFile, PASSWORD));
+ assertNotNull("Key was NULL", factory.readPrivateKey(keyFile, null));
+ }
+
+ @Test
+ public void testLoadUnencryptedPKCS8PrivateKey(){
+ String keyFile = resolveFilename("private-key-clear-pkcs8.pem.txt");
+ SslEngineFacadeFactory factory = new SslEngineFacadeFactory();
+
+ assertNotNull("Key was NULL", factory.readPrivateKey(keyFile, null));
}
private String resolveFilename(String testFilename) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/21b0b76d/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/README.txt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/README.txt b/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/README.txt
index 163d472..24e1f13 100644
--- a/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/README.txt
+++ b/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/README.txt
@@ -35,4 +35,12 @@ openssl rsa -in key.pem.txt -out private-key-clear.pem.txt -outform PEM
echo
+# 3. The following command produces an unprotected PKCS#8 private key
+echo
+echo when prompted, use 'unittest' as the passphrase
+echo
+
+openssl pkcs8 -topk8 -nocrypt -in key.pem.txt -out private-key-clear-pkcs8.pem.txt
+
+echo
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/21b0b76d/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/private-key-clear-pkcs8.pem.txt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/private-key-clear-pkcs8.pem.txt b/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/private-key-clear-pkcs8.pem.txt
new file mode 100644
index 0000000..2956f92
--- /dev/null
+++ b/proton-j/src/test/resources/org/apache/qpid/proton/engine/impl/ssl/private-key-clear-pkcs8.pem.txt
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFsilhVN0i1N5b
+LWpobcvOzoh4zMDMcWw7DquZ5IzwZnlL+9I/Owp9EJcpznb/YpuVE6wrYR7P/C30
+IH0eCSwev+yNi2K/Cf9X+O6YtvzP1HyMGcWNnQpfJbG2IkWjCH5l3UHEl5BOaZu8
+mlgZWYpi77i3rpNAaE1S7x74nkYiAmMM+cBMTlsYEyLse2hdXL5OnSw79LtxcteZ
+al7IJdLscVSP4l3Nt53TIyz8mZsFfIshgxRGrWhIjwM6fmO2tNDPv/Ejmo55sjAA
+JxiTotEjzfMgi9y/qiWmfNWIOMAZPo9C2PkW5R7VYcpWN3gGPKij7NQvBCgXVvqp
+J7mbo7shAgMBAAECggEALVFU2QHqGyTuv7nebYfVs1d2wzI0c+kAJV2Mip9wi18C
+KR/VpzbyhY67CBNTBeHlxjuXOO5vcL/fDNoxtCPoIDhgkmXEQgSZquHeV9WCiGWu
+EzOJLJg2G295mEWs7t1wlAsvG1Ce/MqKr6Y10cHLzjgjgL+c86O1LfCwic9GRl8c
+ec6AwUs/sWvZma44yQsulBXT00v94Xtn64D6MG/TPcjXF7fF7KdzOFQO8G/2Wr3R
+5IywXOP8E6Sofybfb0ZCGTSup/i5vLlp08vn3P9Jwnn83mxxMM9niwYegfWslg5A
+oosvebd6wL0xjtjG54tVT2wWLmSrmKt296HSIjNgAQKBgQDqVjnHSLoB5yk27z+2
+x1XzCTCt1b9Dr/0x1bHrMYE3IDzuHOqu2yuPF/vlIVH0BwVmEEsNQ3JyuwbebsAH
++6umz+xwILw4qR6+8sBQ3HHadPm1B3/QEbc6RUQBAUpmKCyguS+dGJuY86Pk22LL
+Mr0vUfJrk9ppvVbl7irJ13r+IQKBgQDX+MykLC/gq0FstFHbAc75xS/UuXjX0npp
+egWdxhVnx5F6SrP4a0GB4LS/Jh+lChWGmdtlgnL0d/aHqxZuTWKafjg3RAIKRDGE
+bIJf46W/HiRlN0WNBkbjotV1LxWATfX03P4rdqmOMaD03eG3IVXHN3kuEE1gIO42
+Lem8Y38dAQKBgAaiACqq3VD2eQ0sAnKq+7zQUsdo2GwTDCif8tREZ3Lm/7KBsQbX
+/0iilierJMWyeS2lYmpysUecEZq0Kc1QC1DCa9/UnV9BMjSXbGgdhT94tiSwnKaI
+CdalZUJeBfwUQQcflsBslOLkaowsxYQY4I/5UtJGshTyHgaOEjn6VmnhAoGAHrXD
+K6kY2cKgV/vAE/tK2hte9Mm21EGapHr0Z33uN0aaeiA7PRzLQNOaAABEyawIaY5h
+Myr8e6S/SoVaeC7K0ZsXFUy3WYxe2iyv0UDGpcl8dWQJoMb+t4nE/pfGX+s2CS6P
+edCyxYRrFcajPO4hi2Vo9tLcncmw9cVLkj03qwECgYEAgJABS6gx+a0aP9W8wqBJ
+VJogDeAruq3j8+bwr/PqP8bUbjj5gNbblE75jQ890lGv0I71IdxxORprc92pMDRc
+xX6OY4ZzZ2f7fp4kGHF7pHQsg0anYuI1h+87G6Gkyd4RsdZ5EHD1iSJk6DcyD8OH
+ao1P1UBLB8/lyWe+muVftZA=
+-----END PRIVATE KEY-----
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org