You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/12/20 17:05:39 UTC
[2/3] qpid-dispatch git commit: DISPATCH-103: Browser-friendly SSL
test certificate authority
DISPATCH-103: Browser-friendly SSL test certificate authority
Updated certificates test/ssl_certs to be more inter-operable with browswers:
tested chrome, firefox. Authority cert uses RSA encryption and sets extension
flags to identify itself as a root CA. Needed to test SSL for HTTP listeners.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6ecbdba9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6ecbdba9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6ecbdba9
Branch: refs/heads/master
Commit: 6ecbdba9c09a48960eb98fa95afca92b50eb2cb1
Parents: a0a8f97
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Dec 19 18:27:08 2016 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Mon Dec 19 18:27:08 2016 -0500
----------------------------------------------------------------------
tests/displayname_files/profile_names1.json | 2 +-
tests/displayname_files/profile_names2.json | 2 +-
tests/ssl_certs/bad-ca-certificate.pem | 34 ++++++++++----------
tests/ssl_certs/bad-ca.pkcs12 | Bin 1516 -> 2468 bytes
tests/ssl_certs/ca-certificate.pem | 34 ++++++++++----------
tests/ssl_certs/ca.pkcs12 | Bin 1508 -> 2468 bytes
tests/ssl_certs/client-certificate.pem | 32 +++++++++++--------
tests/ssl_certs/client-private-key.pem | 39 +++++++++++++++++------
tests/ssl_certs/client-request.pem | 28 +++++++++-------
tests/ssl_certs/client.pkcs12 | Bin 1652 -> 2604 bytes
tests/ssl_certs/gencerts.sh | 26 ++++++---------
tests/ssl_certs/server-certificate.pem | 31 ++++++++++--------
tests/ssl_certs/server-private-key.pem | 39 +++++++++++++++++------
tests/ssl_certs/server-request.pem | 25 ++++++++-------
tests/ssl_certs/server.pkcs12 | Bin 1564 -> 2492 bytes
tests/system_tests_user_id.py | 15 ++++-----
16 files changed, 178 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/displayname_files/profile_names1.json
----------------------------------------------------------------------
diff --git a/tests/displayname_files/profile_names1.json b/tests/displayname_files/profile_names1.json
index f0f0dd4..afc0d0c 100644
--- a/tests/displayname_files/profile_names1.json
+++ b/tests/displayname_files/profile_names1.json
@@ -2,6 +2,6 @@
"14845961c5646ee0129536b3a9ef1eea0d8d2f26f8c3ed08ece4f8f3027ba9d5": "gmurthy",
"94745961c5646ee0129536b3acef1eea0d8d2f26f8c3ed08ece4f8f3027bcd47": "janedoe",
"94745961c5646ee0129536b3acef1eea0d8d2f26f8c3ed08ece4f8f3027bcd48": "johndoe",
- "60f5dbd7ed14a5ea243785e81745ac8463494298": "user13",
+ "3eccbf1a2f3e46da823c63a9da9158983cb495a3": "user13",
"82244216b6d02ffdfb886c8da3c803e0f7a7b330a7b665dccabd30bd25d0f35e2a4fff5f0a2a01d56eb7dbae085c108e71a32b84bab16c9ec243a1f6d014900d" : "user14"
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/displayname_files/profile_names2.json
----------------------------------------------------------------------
diff --git a/tests/displayname_files/profile_names2.json b/tests/displayname_files/profile_names2.json
index 152f705..1fe9e34 100644
--- a/tests/displayname_files/profile_names2.json
+++ b/tests/displayname_files/profile_names2.json
@@ -2,5 +2,5 @@
"14845961c5646ee0129536b3a9ef1eea0d8d2f26f8c3ed08ece4f5546546": "jerry",
"94745961c5646ee0129536b3acef1eea0d8d2f26f8c353455233027bcd47": "elaine",
"94745961c5646ee0129536b3acef1eea0d8d2f26f8c3ed08ece3027bcd48": "george",
- "7c87f0c974f9e1aa5cb98f13fae9675625f240c98034b888753140da28094879": "user12"
+ "72d543690cb0a8fc2d0f4c704c65411b9ee8ad53839fced4c720d73e58e4f0d7": "user12"
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/bad-ca-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/bad-ca-certificate.pem b/tests/ssl_certs/bad-ca-certificate.pem
index 5064d04..1f01a23 100644
--- a/tests/ssl_certs/bad-ca-certificate.pem
+++ b/tests/ssl_certs/bad-ca-certificate.pem
@@ -1,22 +1,24 @@
Bag Attributes
friendlyName: bad-ca
- localKeyID: 54 69 6D 65 20 31 34 35 39 32 36 38 35 31 31 36 32 34
+ localKeyID: 54 69 6D 65 20 31 34 38 32 31 38 38 39 39 39 31 39 34
subject=/CN=Trusted.CA.com/O=Trust Me Inc.
issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
-----BEGIN CERTIFICATE-----
-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
+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
+9fMEBI6qKA==
-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/bad-ca.pkcs12
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/bad-ca.pkcs12 b/tests/ssl_certs/bad-ca.pkcs12
index ec7e063..531ace8 100644
Binary files a/tests/ssl_certs/bad-ca.pkcs12 and b/tests/ssl_certs/bad-ca.pkcs12 differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/ca-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/ca-certificate.pem b/tests/ssl_certs/ca-certificate.pem
index 0bf774b..e1dcfb4 100644
--- a/tests/ssl_certs/ca-certificate.pem
+++ b/tests/ssl_certs/ca-certificate.pem
@@ -1,22 +1,24 @@
Bag Attributes
friendlyName: ca
- localKeyID: 54 69 6D 65 20 31 34 35 39 32 36 38 35 31 31 33 34 32
+ localKeyID: 54 69 6D 65 20 31 34 38 32 31 38 38 39 39 38 35 36 36
subject=/CN=Trusted.CA.com/O=Trust Me Inc.
issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
-----BEGIN CERTIFICATE-----
-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
+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
+j+kdBLLb4AZR7Pm6wEpLl1UDMi1Gg+6airvE
-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/ca.pkcs12
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/ca.pkcs12 b/tests/ssl_certs/ca.pkcs12
index 0a2eba0..5d8d616 100644
Binary files a/tests/ssl_certs/ca.pkcs12 and b/tests/ssl_certs/ca.pkcs12 differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/client-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/client-certificate.pem b/tests/ssl_certs/client-certificate.pem
index e1b7ff3..eead32f 100644
--- a/tests/ssl_certs/client-certificate.pem
+++ b/tests/ssl_certs/client-certificate.pem
@@ -1,16 +1,20 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/client-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/client-private-key.pem b/tests/ssl_certs/client-private-key.pem
index 77103f9..abb7d52 100644
--- a/tests/ssl_certs/client-private-key.pem
+++ b/tests/ssl_certs/client-private-key.pem
@@ -1,15 +1,34 @@
Bag Attributes
friendlyName: client-certificate
- localKeyID: 54 69 6D 65 20 31 34 35 39 32 36 38 35 31 32 37 35 37
+ localKeyID: 54 69 6D 65 20 31 34 38 32 31 38 39 30 30 30 38 30 37
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBljBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIQOxA9s2N+1kCAggA
-MBQGCCqGSIb3DQMHBAjvrDgMFHHotQSCAVAmcDw8AX52Bd58sW5fUMwbBkgRwkar
-+VTIcyS4CjHmYiWHyXjbbAb/HXuFaOI+nPl1U+SVr9Ji/e1OmRQctPeG+kCJBPOr
-Fy2Dd7ckLzqFY1zYHEpT6CYRmn+wOqszQZ6qYuaWYDJreCHaA3eVFY6WYO3PTCZG
-xqDmWqGVJAShQlUf8OvbpApYa+pAHM+OuU8wTOCHUxrIrvRSwNxW9ju3x3jMABOD
-i6HLMMeUkSJP3lFgiJX7rciVkVIOEYR2pCJfrVVDMlrKzOaDlmzJeWgnvCVbgu7T
-t0HJz7Shx5fauLDzlTcPSmqzyseWkxfNlWVls4ATdu7ufLW4BKgparCo8/Zem9z8
-iZYJLdEWy5f37qQaow9xcf5BAw9bdWHqr2oC1T+YBESNcxqo84d6ULCVlbC0JkyN
-QY2M7IuLhkqSzmPsZgcK2Tv+YXQ7SRQG6MY=
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIpVB1qwawUjgCAggA
+MBQGCCqGSIb3DQMHBAgLOPZ2viV04wSCBMjqZqIv7+O93gZgucmuk9xahBFZYPXU
+p/rVW5czKjw29mJ55lWEc3MfQNMJq/GFaQ9W+uqvJVsi1Ed5vak27eRvy2ojcp/M
+k1M25TFaRxIu9mdbpFCzE51Gv5X7SPU9H64r3AYSCjm32Zb8uVs7lZ9VuHv48c5W
+E3IN1AW61L0sMwDDK/LajG5QOn8eUKaOqYn5CJqVgn7JuRyXwUzCW6vrmidV4Avh
+pdy3TurPeCAClfJz/kN3pLbguvwFoW8vmwAxrhN9qsIsbDyHfK5xoS8LOArTuzEi
+yJ+OOSZ12ZqoV3IEQQ2qbCncyp0uoaqlpCdSSJdiO0RRNeVSnPbRboCK50RrURaf
+Y7xcAayxpFszKGsOhcAHkRQ/z7JWw4ACFN2S4AEEuC0Y0A1mC/gfha5Elcwiw3u/
+P7LN3r0Y03KjQdK6EgkgBZSsJM2HXwonFOvKxDFTATPC1DLMiPI6ZUHqx0ISKlxh
+uho/WLVV5yttyxQlePSPmX+ska71IEYT7On5qupCAZvaPVpm2NiKRmOKwbZY9nHo
+3aVkOxYbDLyEMM24gzNq6whs86ms7DwZrMxA99kz7sZ6xoTehcb/uOq1EDErEryR
+fmChqy+JIzvVaE8ANhPkZmgQKNDWNA9cvCPbV7tCYBw0jvucoV/6GG1QSezxP9uT
+XWg6NTu0+fapIMNuQ8eVE2/RvGGOV7ylvjXXfRcY5vjTgg0GaiYcT/Qy6w90Bl7H
+ObRklDyUC8UCt/vmRU3/fgxQOgVTaIzxIaOs+5WPXcvSTqCL/sMbE1VgMtRnezoD
+C/bt9sqi9eVj3jUnnMgsWtmCzPZFpKDI5Rm6atQzeJVXoa/hllBV5oJjPyzGzmv9
+ocO9JgagtRcFRW4Ea4Y1sW14Lf+bweHzpBY0oIyqwwKBtHKcft+j8X0mWtoiyarb
+h6O4z/79AqoT7PfoezZHMItyPE3CSGwEUK2F294TICEWHU5owvucgdRZ9IHa5li6
+VPq/jcAj67iUSPqq1y4WAmn770vGwq0c386DJgQ6eGPPEa/raNHhIrJ0V5uYmVla
+bCa1+f6t2vz9Og5R1JrJclPAV/yEIJiormpkRN9unCQOPI2HrbiPwU7d9Pk3iL43
+LhiIGqweGhUAlEUXY8VkfUmsdfTzh/nYP1NwPRDTVg4dKjxmexHYvrqiB8Ilxigc
+hkpGQZXHoY5lWVJDoXhZ4NsRXakGh+KU7G+VifJXah8PfN3RbR/nwjSbcMFZQ2HR
+lk+LYwxdvqTMLPb5mHUqfJMWV1XYePGykVDfC5caSVB1FxF/C6lBMU4qOgVZQB36
+ryetJaQOP6oTLfTnM11Mf00MphOA/LXscyQGCYmT+17GpswavdkAGoWrWrxiXe0F
+UOoWeJmTX0TRFnPIYbMtmnfTApMFItEAcMPloI4lg+k37WT6mywl+/oDx5NwPR9g
+MUzKeipIYgSi5DYCUn+Am4Hc4vOtLpluzNql4dXDhQA4ngMRlhGOQUkQ7nqwH6H/
+iK0lDv2r4+Nvgs1n8S9JS+T63iAI02Wiq6w4ErRHrevjo87vinAAw0BosxPtBwbs
+T+CJqgNfGateHYwx3cNI67pNJwjFOrzjbg6Y4H5xbNv56wSRs91nP42tgHiOMYDz
+UfY=
-----END ENCRYPTED PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/client-request.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/client-request.pem b/tests/ssl_certs/client-request.pem
index 025a7e1..6f4d033 100644
--- a/tests/ssl_certs/client-request.pem
+++ b/tests/ssl_certs/client-request.pem
@@ -1,14 +1,18 @@
-----BEGIN NEW CERTIFICATE REQUEST-----
-MIIClDCCAlICAQAwXzESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGllbnQxDDAKBgNV
-BAsTA0RldjEQMA4GA1UEBxMHUmFsZWlnaDELMAkGA1UECBMCTkMxCzAJBgNVBAYTAlVTMIIBuDCC
-ASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7
-WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E
-+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUC
-gYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6Ewo
-FhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWf
-BpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAMti3mE6poYgHEOj2BVAd2YepMWmhdF7MNVCW/7CUcVE
-GPyf838HWpsqSBIR4/K7rEZOVHhYYHdAspjJFfJKUpoD3vebT9As2MG/96vAuKt9EMgRnfgdMiJ2
-VGAQOkfNqUxm87YpZv3U94+OP35RQ+Y2nh8Ls7C8ZsfTneCU0tq9oDAwLgYJKoZIhvcNAQkOMSEw
-HzAdBgNVHQ4EFgQU2AqHQr4Qm7BYd+EPs1lN2qFoiKgwCwYHKoZIzjgEAwUAAy8AMCwCFHmRXqL8
-xEzJPZX2cbvSKyGaBErNAhRFxRMO1VKe1K1i8PMCtYgwf/cGgQ==
+MIIC1DCCAbwCAQAwXzESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGll
+bnQxDDAKBgNVBAsTA0RldjEQMA4GA1UEBxMHUmFsZWlnaDELMAkGA1UECBMCTkMx
+CzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvbJ2
+KG/xefuJfV2XNMiFO9lLESMKLroWaFaC2+pFJ/UUZctUj5jJtKAKWsCq+vKKMtnG
+Pc2r0tkPfqSrdb+Zp7QjsWmlbLiiaFOF165D5PEzaz62iC7l8F9PGPBJOtSTa5l9
+AfnQ8HGzTNTYvJ7YDeyffuBfXedsTi1gT+kjMs2yjTDaVeJotFRYj+wOon4Wq4im
+8Q50rmg/R+8430DU14tm2/OcNNVO43px9Bdq8Ycfr4Xy48JVG69nn/W8Jcs9OPpJ
+ZMjr0OgjDIZW0As0Fk72FQT9GemFMGTUcBUFzYg9c6q98fLQjRPgjjC4/cqB3ya/
+BwNmP6UXMf/FkfkttwIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU
+XKNOdXMsyERFcAt9v7jeUjj9xBEwDQYJKoZIhvcNAQEMBQADggEBAE96yo9Glnb7
+CfEouTboUFxjDhv0FsFaU18nmLd2JHmpJz+aL5z3P0IBhzbeoP1gar9AeZe5XFMZ
+FE07p5vttTnVxaULv+YFJVPhrik4HE5eDOzYUiFmPAM8yPWvDBJsxoXPUNOXyFac
+gDNsTsrByAyLemIdrceJg2xZRtszb3krLzTBnrS9M0rFlJZqUg5nnoB4O7NkvqBt
+3Hi9b3GnBbNlZazQbia+1fEcpDIX00QxFJYhVVMCAtGPUVx8/u99ayLmHOy4zGpM
+BoH3jD2hWkI9OIxPIV7wYK7nUJm6ei5lSzkgrKWAOeOA82f2661u8hngjI/Q3Egt
+ih4PIKhwhS0=
-----END NEW CERTIFICATE REQUEST-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/client.pkcs12
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/client.pkcs12 b/tests/ssl_certs/client.pkcs12
index 6405c53..ce25b72 100644
Binary files a/tests/ssl_certs/client.pkcs12 and b/tests/ssl_certs/client.pkcs12 differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/gencerts.sh
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/gencerts.sh b/tests/ssl_certs/gencerts.sh
index e242419..254a6cb 100755
--- a/tests/ssl_certs/gencerts.sh
+++ b/tests/ssl_certs/gencerts.sh
@@ -2,33 +2,27 @@
rm -f *.pem *.pkcs12 *.p12
-export SERVER=A1.Good.Server.domain.com
+export SERVER=localhost
export CLIENT=127.0.0.1
+export KEYARGS="-storetype pkcs12 -keyalg RSA -keysize 2048 -sigalg sha384WithRSA"
-keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+keytool $KEYARGS -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999 -ext bc:c=ca:true,pathlen:0 -startdate -1m
openssl pkcs12 -nokeys -passin pass:ca-password -in ca.pkcs12 -passout pass:ca-password -out ca-certificate.pem
-keytool -storetype pkcs12 -keystore bad-ca.pkcs12 -storepass bad-ca-password -alias bad-ca -keypass bad-ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+keytool $KEYARGS -keystore bad-ca.pkcs12 -storepass bad-ca-password -alias bad-ca -keypass bad-ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
openssl pkcs12 -nokeys -passin pass:bad-ca-password -in bad-ca.pkcs12 -passout pass:bad-ca-password -out bad-ca-certificate.pem
-keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey -dname "O=Server,CN=$SERVER" -validity 99999
-keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -certreq -file server-request.pem
-keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
+keytool $KEYARGS -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey -dname "O=Server,CN=$SERVER" -validity 99999
+keytool $KEYARGS -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -certreq -file server-request.pem
+keytool $KEYARGS -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-private-key.pem
# Generate a PKCS12 key which will be used for client side cert
-keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey -dname "C=US,ST=NC,L=Raleigh,OU=Dev,O=Client,CN=$CLIENT" -validity 99999
+keytool $KEYARGS -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey -dname "C=US,ST=NC,L=Raleigh,OU=Dev,O=Client,CN=$CLIENT" -validity 99999
# Create a certificate request file
-keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -certreq -file client-request.pem
+keytool $KEYARGS -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -certreq -file client-request.pem
# Create a client certificate
-keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
+keytool $KEYARGS -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
# Create a client private key file.
openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password -out client-private-key.pem
-
-##########################################################################################################################
-
-#keytool -storetype pkcs12 -keystore client1.pkcs12 -storepass client-password -alias client-certificate1 -keypass client-password -genkey -dname "O=Client,CN=$CLIENT" -validity 99999
-#keytool -storetype pkcs12 -keystore client1.pkcs12 -storepass client-password -alias client-certificate1 -keypass client-password -certreq -file client-request1.pem
-#keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request1.pem -outfile client-certificate1.pem
-#openssl pkcs12 -nocerts -passin pass:client-password -in client1.pkcs12 -passout pass:client-password -out client-private-key1.pem
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/server-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/server-certificate.pem b/tests/ssl_certs/server-certificate.pem
index 5a8bf81..9cefa21 100644
--- a/tests/ssl_certs/server-certificate.pem
+++ b/tests/ssl_certs/server-certificate.pem
@@ -1,16 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIIC5jCCAqOgAwIBAgIEQsGiKTALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
-b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTYwMzI5MTYyMTUyWhgPMjI5MDAxMTExNjIx
-NTJaMDUxIjAgBgNVBAMTGUExLkdvb2QuU2VydmVyLmRvbWFpbi5jb20xDzANBgNVBAoTBlNlcnZl
-cjCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
-aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
-58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
-hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
-SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
-qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKBgDmrk0+Ei5+cGfjEXflZCFiq3SnlKlBgdsmX
-mmug1WABhdgkshSvTjPOxKQ/snvxlndQoA3qHq/qLWMKWWJgLkspKEK9AwII5X9GidIhpO8Qc37f
-vwB1mbq79O7QpM7L9Ij640TWZCQZ+2rbze2Uyvh3yggcyPrKlwrTo73N0jU1o0IwQDAfBgNVHSME
-GDAWgBTyfxrSLbex18L8w5oaK6kK4mS5CjAdBgNVHQ4EFgQUrlNxC4cY402bx5dRIcEM8wj6d5Qw
-CwYHKoZIzjgEAwUAAzAAMC0CFQCRJJtNHz/VRX4dDe32QBeUYsIhlwIUFcFlTvavo6JXOJGgKTKw
-1UbboFg=
+MIIDGDCCAgCgAwIBAgIEGlalRzANBgkqhkiG9w0BAQwFADAxMRcwFQYDVQQDEw5U
+cnVzdGVkLkNBLmNvbTEWMBQGA1UEChMNVHJ1c3QgTWUgSW5jLjAgFw0xNjEyMTky
+MzEwMDBaGA8yMjkwMTAwMzIzMTAwMFowJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8w
+DQYDVQQKEwZTZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCS
+XksPE70eYVVl/WK0H+8gdn/3GPdkj0c4psG2q0o1EVWxGYxczC94CleXYg9tA2jl
+fzz4/hyAwmHfbC+eHx+v2CauGam8bQlu3fsthV47b3if4E0RjJA1DJLb36xMoqV6
+w7tgjye0HymTVDLQX/thG8oBHtspQ7Gorn3h6b5mGMULaqe6Ygu+easySRimKFh4
+7ORfpuUesWffbjrD+gsfXVPbOxLgRalXX+VBe2fuWS5Otv2omqrz0iMWbyhwRtV1
+U1rcSWieNUQ323n0mKon15vGAy6i8CFT0hw7SJXf0E0i40ZByb9SDdmes0fbE+hu
+uIabC95h16RqqOHw8fpBAgMBAAGjQjBAMB8GA1UdIwQYMBaAFIKNKmxyN9+AYDjw
+u0i8pcJqWpGnMB0GA1UdDgQWBBTG9hDzVI5ihubr6gtgB+DqWBDzOzANBgkqhkiG
+9w0BAQwFAAOCAQEAHKqpEBTjDgRLXoUkShYreqbzf8jFwyLFbhC48svxXwRNdZuE
+LPXwHFwvdayoOKQeckLav2mDzmyWBF6Lt60Z80HB09SH1HkFH5s+X4R+srBMUtSa
+KsDk5MhoEpLxZNLgQPDEfYOZKUSBBfsx9Pwr10b5vskdPB1X6qE+Iu1UDuZHw/2P
+QnemC+lyDrBJ6SUiewwPQOJfGlSuTEyziQ/NOsZyb9EXEm8wGgodh5JCmb6T2FmF
+ayW5Vu7p3z9BoxEFP0RFLQdtZhjk0rSw4/jWpPVC85eD5tYRGCqW3zEez6aLwB27
+VJ/lpA5PyZN2uN83yeyGFo4VjzNGBLG6f/cJoA==
-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/server-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/server-private-key.pem b/tests/ssl_certs/server-private-key.pem
index 761df08..83ea74d 100644
--- a/tests/ssl_certs/server-private-key.pem
+++ b/tests/ssl_certs/server-private-key.pem
@@ -1,15 +1,34 @@
Bag Attributes
friendlyName: server-certificate
- localKeyID: 54 69 6D 65 20 31 34 35 39 32 36 38 35 31 31 39 30 31
+ localKeyID: 54 69 6D 65 20 31 34 38 32 31 38 38 39 39 39 35 33 38
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBljBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI7x2lcMshKzgCAggA
-MBQGCCqGSIb3DQMHBAhBsRvnJv3zZwSCAVApXO6v8VBDKtIObvKjlGhuAqNh1njI
-YkvWzsDJvOPLGvwduGak+wDM/Y/3uVfa7ZReodhOCiCIO9O9IMxr36Yisf4kqqQK
-ENZYecQ1/w2krA0pQY9d8wCVTp1dEvit4jvZV8qaKyqOcpq7mInOmnfuh7QLzO5j
-/dVgevC7g4Ant+bXhDInNZAp9CK9TuSupqChytRG12M+5nmX6/TSoyj5dLXnfA3c
-n0WI5rYp6Q5Xnn6D8WHQ95z17c6HgIuemgTY4wiY8fOfW0PGP0VtJvMQ9Gk/3eDN
-zGo/XqTDpkSqD1gBvMporxjL+tn4cxP+gdArXmKHQ9Xsi3oE+NBTkYEM0PpB6Dni
-a5U/7ouYw7soKi/F0Xnw4gxm6NwRzLhDBlAWr2X+744kNpxFwfp4esikQIts1n70
-oipv5Z7V/cFmtnreB4c0AYRvKTCPd/Vg4Vs=
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIZaEZ9J0MiLgCAggA
+MBQGCCqGSIb3DQMHBAiDdI6zqmzMsASCBMjEm3M31BwmYOHIwN2Pl7AX+6/2r2a8
+BuzCixorpA4y+OVhLVgNGverxveG+ulthHZB9lUxG3HWfz01cViXbUIxLKjcIdAs
+jpn1zn05oFGxNuGOzJz/sWBHcXytbgaNSapCKYEpsx44x81K8Sn0nj+qphKp0IiR
+fR1KKjtgqL/gTSTxz8X2K/7PfuvCJwEaMsSXsfmK+skQmae4JtrQ8IuVTkuzmEGT
+sTGieSzfdNajrE5CUE6y82QD26TkOEvAnVnH+W3UG1JI+uRymJN3z+PBpfudcZ7C
+N36NlCaE/VyLmNWtNuOhfvm3+jAejRxODKasdtTZewsHK2O/k0e+wXCCjAQ6JIY0
+xXQ3w4tl9EKT6tXaU9CWxi1H9C+JRzY5XkWtCE9upSjcLuKnETrCBcQna70WxBRd
+j7yfox4vZ0XtWkQrPSGZgpmXk6l/hPaJCKJWGfGRkQLklQwIu0f3pD/JEJf4ZrBR
+PIx2EF7GpTLWW0PUua/fyDSHKE3UmBt+tbBvyQ0O5POKHTQ2Po1aoiLfxZE1q/FE
+U41LlWP3qSHjM7ozOthcQeJg3eBshWcWnmGsMl3mehTB7oUL8RMncArl2+rnzz+B
+KX0CwBQFkHHrM/GT+f6FRxBsNHVgTbS/hHqM5jWXnR9guJQnZ1/9HvoFotdOPooq
+/kZNN5Q78S7XplpscuuQLhOApzkUeIDMcjjEaDbfTusv4YLadfBHyTbZ3gmwFwFP
+ZYuk3ecd9/ZUee/L55hynol9wsefITjy/XM7gk/U7Teeo2xt29NreOFQlKy6L5Mh
+b+ArxZMeWdZMqrd/2v1ILJFJvhOH7IFwTLoW/mV8a9nXsi8tt9u12XGn6hCLzVA9
+35WzgyhT4KDwXy2F4BuAgfq/JpDepnoOkX6HocG9+SCOU+MmUCMAxG4HVd/3VJM6
+RbwAm5f01RwjENcrHiWjVyAs/7cjD8XO+OgCFA3XyOr/tKmdlC6r9o/DEwSoGVJS
+a3X41MiVz++A5bdvbXe+ESE8NNefwV8CyOPEVdp/8h+MalV9H5UcTI4jyQ/xK183
+mSrRGjt8rJSWk9RQVT+kWfTignEgbml2yptqUPAfjp4IMhQ9F4U2VE5HOMHkje0L
+PV8pzaUv9KANLTEAkLAQ1kubyxiMD/ikyOOm7WDFdpkpL91Vsm3y0ORfWA6RtwCP
+RqOJVCeW/oUhfSNKkUL9wqGg4mk7FA36Y6vW4iJXqJ3Ferf7DluWAQCi0s33cy8I
+4xBQsOQp2C13VUFsxoNG98V/UwGavAO4lVEKRtvsCyd0HtA5CvexEkAHNrJpluLN
+Fyx5wUb25f1Hv4ESs3tLN5COBMZM/6dx+U8dP0eqm+6ThHxTyh+Stqv9z46+tgFa
+9rovoxBIrlYG+z3iW1aNk4wocKJ69rNlUI0cKWDuxiV8ZFvR+7rgqMv/IoDWHi6+
+KEULAQJAMfVE6HmxkNY+G8w0tzOuqAn+GfXrnNnQNvH0JgmYFypnRtLLK+vFMCeN
+Wn5olygNXI7g6hRKe31jM2aCzlnMtQNrGEw5AfoGOE4hpqihVZC5GdjHA0Z0TxUG
+gtCQhkhWiJcvtyyHKaJgWo52/po4xCWgVGPUfnxI0yuDYIMAtIqprNTHBaNFtKES
+d/M=
-----END ENCRYPTED PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/server-request.pem
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/server-request.pem b/tests/ssl_certs/server-request.pem
index 6ba388f..f051971 100644
--- a/tests/ssl_certs/server-request.pem
+++ b/tests/ssl_certs/server-request.pem
@@ -1,13 +1,16 @@
-----BEGIN NEW CERTIFICATE REQUEST-----
-MIICajCCAicCAQAwNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2ZXIuZG9tYWluLmNvbTEPMA0GA1UE
-ChMGU2VydmVyMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E
-AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up
-1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUj
-C8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZ
-T+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7
-zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAOauTT4SLn5wZ+MRd+VkIWKrd
-KeUqUGB2yZeaa6DVYAGF2CSyFK9OM87EpD+ye/GWd1CgDeoer+otYwpZYmAuSykoQr0DAgjlf0aJ
-0iGk7xBzft+/AHWZurv07tCkzsv0iPrjRNZkJBn7atvN7ZTK+HfKCBzI+sqXCtOjvc3SNTWgMDAu
-BgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBSuU3ELhxjjTZvHl1EhwQzzCPp3lDALBgcqhkjOOAQD
-BQADMAAwLQIUcpYmgcElp/QzRLNmTBvoXIiOTAkCFQCL1UPLa2Q2mxNef8x3UhR9j/nKkQ==
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSXksPE70eYVVl/WK0
+H+8gdn/3GPdkj0c4psG2q0o1EVWxGYxczC94CleXYg9tA2jlfzz4/hyAwmHfbC+e
+Hx+v2CauGam8bQlu3fsthV47b3if4E0RjJA1DJLb36xMoqV6w7tgjye0HymTVDLQ
+X/thG8oBHtspQ7Gorn3h6b5mGMULaqe6Ygu+easySRimKFh47ORfpuUesWffbjrD
++gsfXVPbOxLgRalXX+VBe2fuWS5Otv2omqrz0iMWbyhwRtV1U1rcSWieNUQ323n0
+mKon15vGAy6i8CFT0hw7SJXf0E0i40ZByb9SDdmes0fbE+huuIabC95h16RqqOHw
+8fpBAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBTG9hDzVI5ihubr
+6gtgB+DqWBDzOzANBgkqhkiG9w0BAQwFAAOCAQEAXUxI8QCZpaWC+ysJw8kmLTtV
+szM+Xnt29fA1kgh8BVaMx2xXZpgcBJX/Afd5c5Vamvyqd35LxQrMaD/z2A9dmPsX
+YFKvbTf1IKJv/bQE9hM4c57TR0Gg2CNggzr7y22MsMsM78eGmOZcgEgD7ro3s3x0
+ttL4PYYJCbgo0cmhDaPdS3fKR3U1NhwR9Q6s2e9D5/YcJ6ZMLEhh+b4GhPICigQy
+fC4iLIdD67+k6R2F3TeyVyG9y9y0S/qfQbt4Xc3gHF0YI/2VH9dN7+gbAvDL9xPc
+AmBDNUEKXQKv6TyvojCxC8VZJrlIY9h5c+pXQq4TtvezNEpb+0c6T2Q/gbxe5g==
-----END NEW CERTIFICATE REQUEST-----
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/ssl_certs/server.pkcs12
----------------------------------------------------------------------
diff --git a/tests/ssl_certs/server.pkcs12 b/tests/ssl_certs/server.pkcs12
index 92ee10c..a15edeb 100644
Binary files a/tests/ssl_certs/server.pkcs12 and b/tests/ssl_certs/server.pkcs12 differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6ecbdba9/tests/system_tests_user_id.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_user_id.py b/tests/system_tests_user_id.py
index a62e148..1d1d07d 100644
--- a/tests/system_tests_user_id.py
+++ b/tests/system_tests_user_id.py
@@ -241,32 +241,31 @@ class QdSSLUseridTest(TestCase):
node = Node.connect(addr, ssl_domain=domain)
user_id = node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[0][0]
- self.assertEqual("60f5dbd7ed14a5ea243785e81745ac8463494298",
- user_id)
+ self.assertEqual("3eccbf1a2f3e46da823c63a9da9158983cb495a3", user_id)
addr = self.address(1).replace("amqp", "amqps")
node = Node.connect(addr, ssl_domain=domain)
- self.assertEqual("7c87f0c974f9e1aa5cb98f13fae9675625f240c98034b888753140da28094879",
+ self.assertEqual("72d543690cb0a8fc2d0f4c704c65411b9ee8ad53839fced4c720d73e58e4f0d7",
node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[1][0])
addr = self.address(2).replace("amqp", "amqps")
node = Node.connect(addr, ssl_domain=domain)
- self.assertEqual("82244216b6d02ffdfb886c8da3c803e0f7a7b330a7b665dccabd30bd25d0f35e2a4fff5f0a2a01d56eb7dbae085c108e71a32b84bab16c9ec243a1f6d014900d",
+ self.assertEqual("c6de3a340014b0f8a1d2b41d22e414fc5756494ffa3c8760bbff56f3aa9f179a5a6eae09413fd7a6afbf36b5fb4bad8795c2836774acfe00a701797cc2a3a9ab",
node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[2][0])
addr = self.address(3).replace("amqp", "amqps")
node = Node.connect(addr, ssl_domain=domain)
- self.assertEqual("7c87f0c974f9e1aa5cb98f13fae9675625f240c98034b888753140da28094879;127.0.0.1;Client;Dev;US;NC",
- node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[3][0])
+ self.assertEqual("72d543690cb0a8fc2d0f4c704c65411b9ee8ad53839fced4c720d73e58e4f0d7;127.0.0.1;Client;Dev;US;NC",
+ node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[3][0])
addr = self.address(4).replace("amqp", "amqps")
node = Node.connect(addr, ssl_domain=domain)
- self.assertEqual("60f5dbd7ed14a5ea243785e81745ac8463494298;US;NC",
+ self.assertEqual("3eccbf1a2f3e46da823c63a9da9158983cb495a3;US;NC",
node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[4][0])
addr = self.address(5).replace("amqp", "amqps")
node = Node.connect(addr, ssl_domain=domain)
- self.assertEqual("US;NC;82244216b6d02ffdfb886c8da3c803e0f7a7b330a7b665dccabd30bd25d0f35e2a4fff5f0a2a01d56eb7dbae085c108e71a32b84bab16c9ec243a1f6d014900d",
+ self.assertEqual("US;NC;c6de3a340014b0f8a1d2b41d22e414fc5756494ffa3c8760bbff56f3aa9f179a5a6eae09413fd7a6afbf36b5fb4bad8795c2836774acfe00a701797cc2a3a9ab",
node.query(type='org.apache.qpid.dispatch.connection', attribute_names=['user']).results[5][0])
addr = self.address(6).replace("amqp", "amqps")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org