From 48555c5d1fd202088f70a04084b73cab9ee41648 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Sat, 22 Feb 2014 20:05:21 +0100 Subject: [PATCH] THRIFT-2325 SSL-test-certificates.patch Java test suite use keys and certs from test/keys/ Patch: Roger Meier --- lib/java/test/.keystore | Bin 1414 -> 2427 bytes lib/java/test/.truststore | Bin 708 -> 1143 bytes test/keys/README.md | 30 ++++++++++++++++++++++++++++++ test/keys/server.p12 | Bin 0 -> 2677 bytes 4 files changed, 30 insertions(+) create mode 100644 test/keys/server.p12 diff --git a/lib/java/test/.keystore b/lib/java/test/.keystore index 0c851114ff7d83c64f2371aa77c0a72c5e6b56de..bfc058cac919fb8d43c24a68759fcc979b8efdea 100644 GIT binary patch literal 2427 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 K5nP)B9|8cv8cNpy diff --git a/lib/java/test/.truststore b/lib/java/test/.truststore index c24b4a252a91b1e280e70de5ed787f358e1aebc4..36f3ab6c0c0978ee5d1dcfcb27ee0bbe09820d46 100644 GIT binary patch literal 1143 zcmezO_TO6u1_mY|W(3ph#l<-#sl_EgzKf6l&Q%Po5qhQumJAFm<_1kH#s*Ey(hHcG z7@3$j85Zog@IGpF)M5i(HcqWJkGAi;jEt_C*_cCF*o2uvgAD}@_(2>F z9uD8cqRO1ayc9zb10j$QI}f*8ei6_%1&_>}97A;jRgfqbk6cJbs)A!dVlt2l&QB{T zPb^ARaLX^vOGzxr%+E6vGY|nOjoab6=M0}~?)D0c|@sEJVtIa(N5 z8JL?G`56qF7`d357#SH(&pBgVS-P(05`W#c9Y1;h*~i<)C3nZa(5Pr$d?|`)a@o$C zODi^Ry(Qt5dhg36Rl!$Y>$enwYV;4S(i5{zZ~$ z4j=!w3q9YLyJXQfr;KOQmIg&mH2)|ovE!G;F-zabbN{$L?JQrO#>KO8&zgA`ITw9+ zW$JI#e&6XkkCWm2)T#|G@o}Q%4BZQFpIZK0bD?|hqQA?9*C|%C#{ZULSL={G(DA(| zuFg93!oq3iOtlxW` zJ8tfpUwkR;TXLov9Z`={T69W(g7BP7`Gri(j0}v60}T8OWPvG0mXAe@MWlN@N8?+q zqhYTrI!vXUmL>+Bp0~?D9we>IB4HrbfL#F(NP#d5s{u13i#QP$u%SFy*Y2G}~l8hEDq1pNz4_Q6#3-(srkUUq|^ZevP z9s50@yo>LDX_@zu?Wk(iyH~s?-^_gN!j;57S@%lI)_rX4GUt3A{>!i3A#9je!NkBrHlb2;wHsUW3TG|(!1_Nt^o~eN)P(`aj6H}u>6XUA|%uI|- zOe{X@?JgSdvT3^OEUBG48;sYK#I79d7+9zz)m&f2RZ{N z&MeFZ5ipPw=QT7iG%&C*G&MCbHIEYKH8L?UGc<#82a7Ws=Oc$7BP#=QV=piaJDD0A z8J2oqx_@BHk!kLy%wn>*v)5V7`W+E5BS>uZ@BY)5Esf(O%2qiwUA!6|d$MTDYpx5s z{+(g*s$&e#UU)A&Yu$$j5pqH^%AzjbQ8~Wko`u+RrL~b~ME~9VA{1UBnttr*-USDb zFJqi6Q26Tgw{<iyD>~hc^&V@6$y$rGX6Gu-yCL=> diff --git a/test/keys/README.md b/test/keys/README.md index fa1684e8..d4bb5a33 100755 --- a/test/keys/README.md +++ b/test/keys/README.md @@ -26,6 +26,10 @@ we use the following parameters for test key and certificate creation openssl x509 -in server.crt -text > CA.pem cat server.crt server.key > server.pem +Export password is **thrift** + + openssl pkcs12 -export -clcerts -in server.crt -inkey server.key -out server.p12 + ### create client key and certificate openssl genrsa -out client.key @@ -45,3 +49,29 @@ export certificate in PKCS12 format export certificate in PEM format for OpenSSL usage openssl pkcs12 -in client.p12 -out client.pem -clcerts + + +## Java key and certificate import +Java Test Environment uses key and trust store password **thrift** + +list keystore entries + + keytool -list -storepass thrift -keystore ../../lib/java/test/.keystore + +list truststore entries + + keytool -list -storepass thrift -keystore ../../lib/java/test/.truststore + +import certificate into truststore + + keytool -importcert -storepass thrift -keystore ../../lib/java/test/.truststore -alias ssltest --file server.crt + +import key into keystore + + keytool -importkeystore -storepass thrift -keystore ../../lib/java/test/.keystore -srcstoretype pkcs12 -srckeystore server.p12 + +# Test SSL server and clients + + openssl s_client -connect localhost:9090 + openssl s_server -accept 9090 -www + diff --git a/test/keys/server.p12 b/test/keys/server.p12 new file mode 100644 index 0000000000000000000000000000000000000000..65fc21aeb001525279fc562a56aa004fe8ce3737 GIT binary patch literal 2677 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 f{N^u0F|u8e(SPlng*%w*-iMy+af`emf0X