summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/certs/c_rsa1024_priv.pem26
-rw-r--r--java/certs/c_rsa1024_pub.pem82
-rw-r--r--java/certs/cacert.pem30
-rw-r--r--java/certs/certs.jksbin1298 -> 1298 bytes
-rw-r--r--java/certs/client.jksbin4316 -> 4314 bytes
-rwxr-xr-xjava/certs/makecerts31
-rw-r--r--java/certs/openssl/cacert.derbin1235 -> 1235 bytes
-rw-r--r--java/certs/openssl/client.cnf2
-rw-r--r--java/certs/openssl/ice_ca.cnf2
-rw-r--r--java/certs/openssl/server.cnf2
-rw-r--r--java/certs/s_rsa1024_priv.pem26
-rw-r--r--java/certs/s_rsa1024_pub.pem82
-rw-r--r--java/certs/server.jksbin4316 -> 4315 bytes
13 files changed, 146 insertions, 137 deletions
diff --git a/java/certs/c_rsa1024_priv.pem b/java/certs/c_rsa1024_priv.pem
index 01f07952e90..09e5bdcac78 100644
--- a/java/certs/c_rsa1024_priv.pem
+++ b/java/certs/c_rsa1024_priv.pem
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQCnYEOuivWWRk4Mjo1ZuqKix4LOlaBqsfA8Z+CG7ZK2ByzXzYEE
-M1pO4qDKQJ/J5pn1NVSAxi/uVQ+NkHMF0NIBhOQRzFYSPuuqc+iuplwQ21KXSBMR
-e1wUWOHas7/7AmImnS/1xPbrotR2viQYjxG8K9ztbSu3gNmOsTj5uD/haQIDAQAB
-AoGBAJ7DpE+rRhseYyhsC85iR6TqZLy6l2i9kmhqDENQlQqPMc0eBNRMNcyAEg7n
-T+p/D+jVhmuEErEbBF6+9yw8EQaQukLHIersJ2uQlQjsHHnn8Ycx9/800i/2TxK6
-rMu8RNkU68CaPn3HWbVMLdoZMsm6KE5TGwQXfz4VPgF7FOfVAkEA2PHlXPhfVnLF
-FPnlEySkJxojjXiqHljg3ksEzP0fB3fxsmn+W4qwO8PR0zSQf3ssUWq982isoXLa
-UUr7p00XuwJBAMWB8RAqaHUIdAItzu2OoP1LPxK8wpd8zfdhB1X2pHKZoppYCmNN
-jWPUkB81uh2o+WEPxAEs0YfO84LSXH9T3ysCQQDRiwv0eb50XJS5xwmZLOoVDq1K
-Z0NB3q0MaT9w1AhViWf94V0ahGHmyCRyMTJkv881sLlaUz9zDeGLZbaeiNsjAkEA
-ouCcCfbPGeSUts9MHMBIp1oMc8lSuFbmDCHqSMwTpaZpX9tHBcmI1lEPYY2PJLKa
-pZ64xzdMvDDAxJvyR9bE7QJBALr6RmlPtZi59b8RTzj31gemhPD6/U4XctlCsJw4
-o/i/ITI+OJahHOinY8yIk1IjteZ6qQJsJjrv/988vMU3JBI=
+MIICXQIBAAKBgQDLBGJk42VWKgdywVyb5DJZRo7jK85tq4DABgTKyfHDg92whm0r
+Qnu2RsWSgVlOOg1IJXdtltKfO8yhtwWFk7c6Fquvbx+Fws+DKDgOlnNOPE/W7j77
+K0QtA1gJfYISet+k+Kj7FkIHkKLLiPqpUDty/+tK2B1Ftz8Ayd7/Lo8iWQIDAQAB
+AoGBAJb0CZ1un7jzw1oGgK/Be9Z56mDr/6/4J+GgGAwZIFT6Reqt6ZqS8p3T/bAz
+0Y2jCKEuiqDH1pBjzIIqLkbmUQPjNHKnNbD2k39kdF64rfRZjeSlgTrsm1DPbbOO
+S/goACPG7QE926fTKIrqiYDtbGQnzfyhwW7vE55mGrQ97rchAkEA5LREW5fpaM/4
+fiF9H9GhvMvb2P6UU1QVQQEFsJatjGeTVG7eItLA5vsnC+ie1nP2dnM2FzEaGDBv
+qrYLhjYPbQJBAOM/STmVdTj5Aa0QFv1g74DGbNrIDcGu29Ly1k5C+ikrXADqH5Vn
+aHWEj0euzmndaqHa0oe2Vw3WpuzIwnCoDx0CQQClUwajK4Jn6QbZrr2zlaeUQc2P
+5CA2yG6Aygth5tpXx7vB6k8b3zvg/SbxvdusbLF6WLh+NVmGqOTgA676+vNVAkB7
+tIvMCQxTA1piN4wMSqSWWW4Qey7h7KpF32PCHrvHhY8EAG9JCY3Xy12kDAjZoGrX
+ySMqNZyWL++WnoMaiKIRAkAwr4XLZDcrBdb7pbI9R4saOd0VGXf0nYm9wByrJyst
+vVl022RCuMxw82n2CZxk5CZFsKbndWd0W+gybzni44uI
-----END RSA PRIVATE KEY-----
diff --git a/java/certs/c_rsa1024_pub.pem b/java/certs/c_rsa1024_pub.pem
index a4403160222..4861583f96a 100644
--- a/java/certs/c_rsa1024_pub.pem
+++ b/java/certs/c_rsa1024_pub.pem
@@ -5,71 +5,71 @@ Certificate:
Signature Algorithm: md5WithRSAEncryption
Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
Validity
- Not Before: Dec 29 22:03:48 2004 GMT
- Not After : Dec 29 22:03:48 2005 GMT
+ Not Before: Dec 31 03:36:55 2005 GMT
+ Not After : Dec 30 03:36:55 2010 GMT
Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceclient@@some.net, CN=Ice Client
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public Key: (1024 bit)
Modulus (1024 bit):
- 00:a7:60:43:ae:8a:f5:96:46:4e:0c:8e:8d:59:ba:
- a2:a2:c7:82:ce:95:a0:6a:b1:f0:3c:67:e0:86:ed:
- 92:b6:07:2c:d7:cd:81:04:33:5a:4e:e2:a0:ca:40:
- 9f:c9:e6:99:f5:35:54:80:c6:2f:ee:55:0f:8d:90:
- 73:05:d0:d2:01:84:e4:11:cc:56:12:3e:eb:aa:73:
- e8:ae:a6:5c:10:db:52:97:48:13:11:7b:5c:14:58:
- e1:da:b3:bf:fb:02:62:26:9d:2f:f5:c4:f6:eb:a2:
- d4:76:be:24:18:8f:11:bc:2b:dc:ed:6d:2b:b7:80:
- d9:8e:b1:38:f9:b8:3f:e1:69
+ 00:cb:04:62:64:e3:65:56:2a:07:72:c1:5c:9b:e4:
+ 32:59:46:8e:e3:2b:ce:6d:ab:80:c0:06:04:ca:c9:
+ f1:c3:83:dd:b0:86:6d:2b:42:7b:b6:46:c5:92:81:
+ 59:4e:3a:0d:48:25:77:6d:96:d2:9f:3b:cc:a1:b7:
+ 05:85:93:b7:3a:16:ab:af:6f:1f:85:c2:cf:83:28:
+ 38:0e:96:73:4e:3c:4f:d6:ee:3e:fb:2b:44:2d:03:
+ 58:09:7d:82:12:7a:df:a4:f8:a8:fb:16:42:07:90:
+ a2:cb:88:fa:a9:50:3b:72:ff:eb:4a:d8:1d:45:b7:
+ 3f:00:c9:de:ff:2e:8f:22:59
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Basic Constraints:
CA:FALSE
X509v3 Subject Key Identifier:
- CE:1D:95:F9:30:2E:57:25:FD:BE:66:65:A8:76:4B:BF:08:F1:68:23
+ E1:81:03:43:D3:BB:62:8A:AC:55:30:31:62:5B:FE:F3:88:53:4D:72
X509v3 Authority Key Identifier:
- keyid:55:0C:8A:3B:A7:A4:5B:49:3C:0B:5D:1B:39:44:C9:BB:79:C3:5F:82
+ keyid:5D:AB:9C:15:8E:87:F7:67:EE:CE:93:66:AF:AA:79:4D:8E:D8:E7:CC
DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
serial:00
Signature Algorithm: md5WithRSAEncryption
- 14:7a:c9:c1:30:aa:71:4f:5d:00:b5:73:82:2d:6c:84:90:24:
- 67:06:a5:87:06:9d:0d:a9:bb:56:0d:fe:d5:0c:5d:24:6c:8f:
- 3c:9f:8f:5f:85:69:2a:e5:de:22:4e:b5:06:73:f3:88:f3:87:
- ac:f0:67:5c:8a:62:ce:c6:39:62:64:5e:ea:fb:8b:94:56:e9:
- 2c:1f:9e:dc:d4:8e:f4:42:c0:d9:35:e5:4a:56:dd:25:a1:41:
- d2:e2:ca:18:44:c7:01:3f:8f:ee:3a:67:b5:37:6e:bd:8f:3c:
- 5d:20:52:95:c5:07:c2:c4:08:27:28:3d:97:10:e5:b5:96:ef:
- 78:04:f5:6b:12:45:2f:fe:47:47:69:72:d8:ef:39:03:09:c5:
- 68:d1:2a:b2:82:46:78:ad:55:fd:ba:86:25:53:35:ba:a6:c4:
- 30:2a:bb:01:c4:da:45:e9:cd:d4:3c:1d:c4:7c:b3:fb:cd:d5:
- 92:d0:ce:83:29:11:98:c8:08:13:9f:2f:f4:b3:f8:ee:cf:7b:
- 85:a9:28:33:07:54:99:50:92:06:8b:88:58:ee:7a:ff:7e:ff:
- ca:f9:c0:ed:2f:9f:26:8f:0f:7b:67:55:1b:ec:e9:2f:bc:54:
- 44:b4:a8:46:fe:7c:98:5d:e8:30:c8:37:d4:82:d8:aa:33:32:
- cf:df:96:b4
+ 7f:33:3d:f0:4c:95:0d:3c:dd:4d:0c:d1:7f:46:7f:ff:e3:57:
+ 9a:4b:3f:15:96:06:47:5e:a0:df:cf:7a:c9:a2:a2:d8:e0:be:
+ ec:62:cd:40:1d:b1:58:66:16:99:88:87:9d:69:fc:6d:51:45:
+ f5:4d:0f:38:21:b5:7b:68:95:f2:02:83:03:02:56:4e:b4:9d:
+ 83:0d:e8:5e:40:64:d1:c8:a6:af:7f:18:aa:76:d5:e2:47:74:
+ 96:09:c4:95:62:1a:82:67:ff:28:b5:3c:72:07:36:b8:e2:9b:
+ 88:4d:cb:fd:f6:b1:28:e8:42:82:f4:f5:42:b4:e1:e5:2f:d0:
+ c0:db:88:76:71:32:84:10:fb:af:c5:0f:1a:7c:25:a8:65:d5:
+ d4:ca:34:42:5e:d3:3b:cd:48:22:46:b0:c9:a1:75:12:30:9e:
+ fd:44:93:a5:6a:a2:2a:f4:e0:86:8e:d1:f8:22:23:c4:50:00:
+ 84:53:22:18:73:35:54:35:36:a5:4e:9e:21:77:2a:f5:4a:0c:
+ 90:09:b5:c6:fd:44:b5:4b:01:2e:76:3c:c4:b4:df:f2:2a:cd:
+ e3:e8:f8:4f:47:70:46:7d:a7:ff:3d:2f:a7:b8:52:9c:f9:ac:
+ e5:b4:e4:03:38:9a:3d:49:66:ba:0e:e6:12:47:f4:87:c6:e8:
+ b7:02:0f:14
-----BEGIN CERTIFICATE-----
MIIEKjCCAxKgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wNDEyMjkyMjAzNDhaFw0wNTEyMjkyMjAzNDhaMIGIMQswCQYD
+b21lLm5ldDAeFw0wNTEyMzEwMzM2NTVaFw0xMDEyMzAwMzM2NTVaMIGIMQswCQYD
VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEiMCAGCSqGSIb3DQEJARYTaWNlY2xp
ZW50QEBzb21lLm5ldDETMBEGA1UEAxMKSWNlIENsaWVudDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAp2BDror1lkZODI6NWbqioseCzpWgarHwPGfghu2Stgcs
-182BBDNaTuKgykCfyeaZ9TVUgMYv7lUPjZBzBdDSAYTkEcxWEj7rqnPorqZcENtS
-l0gTEXtcFFjh2rO/+wJiJp0v9cT266LUdr4kGI8RvCvc7W0rt4DZjrE4+bg/4WkC
-AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUzh2V+TAuVyX9vmZlqHZL
-vwjxaCMwgdIGA1UdIwSByjCBx4AUVQyKO6ekW0k8C10bOUTJu3nDX4Khgaukgagw
+AQEFAAOBjQAwgYkCgYEAywRiZONlVioHcsFcm+QyWUaO4yvObauAwAYEysnxw4Pd
+sIZtK0J7tkbFkoFZTjoNSCV3bZbSnzvMobcFhZO3Oharr28fhcLPgyg4DpZzTjxP
+1u4++ytELQNYCX2CEnrfpPio+xZCB5Ciy4j6qVA7cv/rStgdRbc/AMne/y6PIlkC
+AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQU4YEDQ9O7YoqsVTAxYlv+
+84hTTXIwgdIGA1UdIwSByjCBx4AUXaucFY6H92fuzpNmr6p5TY7Y58yhgaukgagw
gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lIFN0YXRlMRIwEAYDVQQHEwlT
b21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29tcGFueTEUMBIGA1UECxMLRGV2ZWxv
cG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRswGQYJ
-KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBABR6
-ycEwqnFPXQC1c4ItbISQJGcGpYcGnQ2pu1YN/tUMXSRsjzyfj1+FaSrl3iJOtQZz
-84jzh6zwZ1yKYs7GOWJkXur7i5RW6SwfntzUjvRCwNk15UpW3SWhQdLiyhhExwE/
-j+46Z7U3br2PPF0gUpXFB8LECCcoPZcQ5bWW73gE9WsSRS/+R0dpctjvOQMJxWjR
-KrKCRnitVf26hiVTNbqmxDAquwHE2kXpzdQ8HcR8s/vN1ZLQzoMpEZjICBOfL/Sz
-+O7Pe4WpKDMHVJlQkgaLiFjuev9+/8r5wO0vnyaPD3tnVRvs6S+8VES0qEb+fJhd
-6DDIN9SC2KozMs/flrQ=
+KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAH8z
+PfBMlQ083U0M0X9Gf//jV5pLPxWWBkdeoN/PesmiotjgvuxizUAdsVhmFpmIh51p
+/G1RRfVNDzghtXtolfICgwMCVk60nYMN6F5AZNHIpq9/GKp21eJHdJYJxJViGoJn
+/yi1PHIHNrjim4hNy/32sSjoQoL09UK04eUv0MDbiHZxMoQQ+6/FDxp8Jahl1dTK
+NEJe0zvNSCJGsMmhdRIwnv1Ek6Vqoir04IaO0fgiI8RQAIRTIhhzNVQ1NqVOniF3
+KvVKDJAJtcb9RLVLAS52PMS03/IqzePo+E9HcEZ9p/89L6e4Upz5rOW05AM4mj1J
+ZroO5hJH9IfG6LcCDxQ=
-----END CERTIFICATE-----
diff --git a/java/certs/cacert.pem b/java/certs/cacert.pem
index 0f7422d021a..d2e37462e4c 100644
--- a/java/certs/cacert.pem
+++ b/java/certs/cacert.pem
@@ -3,26 +3,26 @@ MIIEzzCCA7egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wNDEyMjkyMjAzNDdaFw0wOTEyMjgyMjAzNDdaMIGlMQswCQYD
+b21lLm5ldDAeFw0wNTEyMzEwMzM2NTVaFw0xMDEyMzAwMzM2NTVaMIGlMQswCQYD
VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTESMBAGA1UEBxMJU29tZXdoZXJl
MRUwEwYDVQQKEwxZb3VyIENvbXBhbnkxFDASBgNVBAsTC0RldmVsb3BtZW50MSMw
IQYDVQQDExpZb3VyIENlcnRpZmljYXRlIEF1dGhvcml0eTEbMBkGCSqGSIb3DQEJ
ARYMeW91QHNvbWUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-tGxI1Cvk45Ehs2KHnqBIwmCM4rhr4W8U3yolew2d3hQfqKOthxbbHETS877ktxdQ
-sP/kTtoQKZ5DrdqCi1B0F64Sq24YfQS5k2td7RWL3GuqEi9eQSlc9mhdbc18eG2W
-Wg8NmPAYSWw9QxXdUzVKi6bAiiuLJxfEmHSS2yFK42fo2tzKap0U34o/dxVSZvkJ
-4yyNtdLB2Wb1wCx7AZJAGpYr/RMm9sHS/+0C1SAfcow2t36Jb++wG4wCQpZ76M1A
-GU6pmB+E+vSY7sQ40VpAigbwv9TDSntZMHah6EUbP9aHmAhzL0hRSKoMLO/ntfSr
-2Ra29hC+bveXOChwnBjCswIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
-HQ4EFgQUVQyKO6ekW0k8C10bOUTJu3nDX4IwgdIGA1UdIwSByjCBx4AUVQyKO6ek
-W0k8C10bOUTJu3nDX4KhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
+sDoVCNMcfwsa29YgV2zvBzuvA0QboHpoyESYcVWxLiApeHnqIDGSxI8+smuJ3qwR
+cmWzbMNHU0s6YWCGOVl92UAcSU1ushXu+SOWeoyrVjOfLM4RtG7k5Y2XmGShQZA1
+yOI+MPqoGOu9hDBKUJwoGf6rFC8m9stcmRy+p+bKBdn2/AHewY87kNB1aKXJgLac
++haVHtCzskzM6ax1vycKQaG2vfvki/QBXVP0KHpu9b0PCPseWf/K3dvj7CsuyIbo
+OdLhrhXaYCjIU23U6KigvmbZ+y4Zhgi+w60E07/RCu1XH5n8CDAvaOZ522DB7K68
+3ALhbmiTuB9zVbS3nKEqNQIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUXaucFY6H92fuzpNmr6p5TY7Y58wwgdIGA1UdIwSByjCBx4AUXaucFY6H
+92fuzpNmr6p5TY7Y58yhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
b21lIFN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29t
cGFueTEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlm
aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAw
-DQYJKoZIhvcNAQEEBQADggEBAI6+R9mkh4bDaEq2ORg2M+g8t2vWrXpUFgUdF2fV
-250acDmAQ954PqmQCrHxta4NhtSWvKJlYADfXF8vFvo29bGhDHVgCg0qdcVSJUrN
-nKenYIMiMES605l4WvtDzSvROb8LnRpQ5X8mNLl3xEhqtTuGJJoOTYEsSg5EBNq7
-rELheieXT3Uv70SwxrNbf8YdTMX5xZffg7gqpHhPyOV8lw48HOpfyhz3GRVh7ge0
-a0sBrEVYEfyUKbq8b66XILeO+rbiXgRH3hm57CLiB+bXyTNbjMRhd5BILEO6acHj
-rm4PkDLdcU5QVERAwQVJRaE2BUc8Oqw1ug3NC5Yumxd6Tuc=
+DQYJKoZIhvcNAQEEBQADggEBAEJzVndUH3xI/JN/1fJRRMou4UXxKjtW0WZLK/3p
+IlyBi8/o2cYtl+voOkjm3ROvGfx2Atw9OHqU8q09Dojd0cuAveDAXK8fNSHfpQES
+yH00rkX/swTR5C6TruD+fCD6OFxACzvnglrNWxIfheVClY1iXaaukyv2aaNn7E/P
+3wM5mPSq4SxYIOk5T6pt5iVebyEsNvS2roW/XP/flOsVwOSyktfYrvOQOaVPEexH
+LDAzL2ozfQ7OFPsrUjO3jy6r/DMTH2uhzPgJeOZ2e5p4aPA1SHECCGBvUMJHt5T4
+KgPgIvXJV9Mp8KN/UEUo43wTO2Qxat4kjTvF+HtiBuUKMbk=
-----END CERTIFICATE-----
diff --git a/java/certs/certs.jks b/java/certs/certs.jks
index eabf8e881bf..641b8f13e5c 100644
--- a/java/certs/certs.jks
+++ b/java/certs/certs.jks
Binary files differ
diff --git a/java/certs/client.jks b/java/certs/client.jks
index 66d0e38928f..a9166fef423 100644
--- a/java/certs/client.jks
+++ b/java/certs/client.jks
Binary files differ
diff --git a/java/certs/makecerts b/java/certs/makecerts
index 1df94ad0f13..bcc83e001f2 100755
--- a/java/certs/makecerts
+++ b/java/certs/makecerts
@@ -35,21 +35,25 @@ fi
if ! [ -f server.jks ]; then
echo "Generating server's private key and certificate..."
keytool -genkey -alias rsakey -keyalg RSA -keysize 1024 -keypass password -validity 1825 -keystore server.jks \
- -storepass password -dname "CN=Ice Server, OU=Development, O=Your Company, L=Somewhere, S=Some State, C=US"
+ -storepass password -dname "CN=Ice Server, OU=Development, O=Your Company, L=Somewhere, S=Some State, C=US" \
+ || exit 1
echo "Importing trusted CA certificate..."
- keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore server.jks -storepass password -noprompt
+ keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore server.jks -storepass password -noprompt \
+ || exit 1
# TODO: Not sure why this is necesssary, but without it openssl fails.
rm -f $CA_HOME/ca/index.txt
touch $CA_HOME/ca/index.txt
echo "Signing server's certificate..."
- keytool -certreq -alias rsakey -keystore server.jks -keypass password -storepass password -file server_rsa.csr
+ keytool -certreq -alias rsakey -keystore server.jks -keypass password -storepass password -file server_rsa.csr \
+ || exit 1
openssl ca -config $CA_HOME/server.cnf -batch -in server_rsa.csr -out server_rsa.pem \
- -cert $ICE_HOME/certs/cacert.pem -keyfile $ICE_HOME/certs/ca/cakey.pem -days 1825
+ -cert $ICE_HOME/certs/cacert.pem -keyfile $ICE_HOME/certs/cakey.pem -days 1825
openssl x509 -in server_rsa.pem -outform DER -out server_rsa.der
- keytool -import -alias rsakey -keystore server.jks -storepass password -file server_rsa.der
+ keytool -import -alias rsakey -keystore server.jks -storepass password -file server_rsa.der \
+ || exit 1
rm -f server_rsa.*
else
@@ -62,21 +66,25 @@ fi
if ! [ -f client.jks ]; then
echo "Generating client's private key and certificate..."
keytool -genkey -alias rsakey -keyalg RSA -keysize 1024 -keypass password -validity 1825 -keystore client.jks \
- -storepass password -dname "CN=Ice Client, OU=Development, O=Your Company, L=Somewhere, S=Some State, C=US"
+ -storepass password -dname "CN=Ice Client, OU=Development, O=Your Company, L=Somewhere, S=Some State, C=US" \
+ || exit 1
echo "Importing trusted CA certificate..."
- keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore client.jks -storepass password -noprompt
+ keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore client.jks -storepass password -noprompt \
+ || exit 1
# TODO: Not sure why this is necesssary, but without it openssl fails.
rm -f $CA_HOME/ca/index.txt
touch $CA_HOME/ca/index.txt
echo "Signing client's certificate..."
- keytool -certreq -alias rsakey -keystore client.jks -keypass password -storepass password -file client_rsa.csr
+ keytool -certreq -alias rsakey -keystore client.jks -keypass password -storepass password -file client_rsa.csr \
+ || exit 1
openssl ca -config $CA_HOME/client.cnf -batch -in client_rsa.csr -out client_rsa.pem \
- -cert $ICE_HOME/certs/cacert.pem -keyfile $ICE_HOME/certs/ca/cakey.pem -days 1825
+ -cert $ICE_HOME/certs/cacert.pem -keyfile $ICE_HOME/certs/cakey.pem -days 1825
openssl x509 -in client_rsa.pem -outform DER -out client_rsa.der
- keytool -import -alias rsakey -keystore client.jks -storepass password -file client_rsa.der
+ keytool -import -alias rsakey -keystore client.jks -storepass password -file client_rsa.der \
+ || exit 1
rm -f client_rsa.*
else
@@ -88,7 +96,8 @@ fi
#
if ! [ -f certs.jks ]; then
echo "Creating truststore..."
- keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore certs.jks -storepass password -noprompt
+ keytool -import -alias cacert -file $CA_HOME/cacert.der -keystore certs.jks -storepass password -noprompt \
+ || exit 1
else
echo "Skipping truststore..."
fi
diff --git a/java/certs/openssl/cacert.der b/java/certs/openssl/cacert.der
index e5ef085fefd..9e0f827b2c0 100644
--- a/java/certs/openssl/cacert.der
+++ b/java/certs/openssl/cacert.der
Binary files differ
diff --git a/java/certs/openssl/client.cnf b/java/certs/openssl/client.cnf
index 8300465a55a..61e11fb71ce 100644
--- a/java/certs/openssl/client.cnf
+++ b/java/certs/openssl/client.cnf
@@ -25,7 +25,7 @@ database = $dir/ca/index.txt # Database index file.
new_certs_dir = $dir/ca # Default loc for new certs.
serial = $dir/ca/serial # The current serial number.
-default_days = 365 # How long certs are valid.
+default_days = 1825 # How long certs are valid.
default_md = md5 # The Message Digest type.
preserve = yes # Keep passed DN ordering?
diff --git a/java/certs/openssl/ice_ca.cnf b/java/certs/openssl/ice_ca.cnf
index 24ac290ae53..f05756d5ed7 100644
--- a/java/certs/openssl/ice_ca.cnf
+++ b/java/certs/openssl/ice_ca.cnf
@@ -20,7 +20,7 @@ default_ca = ice
[ ice ]
-default_days = 365 # How long certs are valid.
+default_days = 1825 # How long certs are valid.
default_md = md5 # The Message Digest type.
preserve = no # Keep passed DN ordering?
diff --git a/java/certs/openssl/server.cnf b/java/certs/openssl/server.cnf
index db535122289..bc3a2bfac03 100644
--- a/java/certs/openssl/server.cnf
+++ b/java/certs/openssl/server.cnf
@@ -25,7 +25,7 @@ database = $dir/ca/index.txt # Database index file.
new_certs_dir = $dir/ca # Default loc for new certs.
serial = $dir/ca/serial # The current serial number.
-default_days = 365 # How long certs are valid.
+default_days = 1825 # How long certs are valid.
default_md = md5 # The Message Digest type.
preserve = yes # Keep passed DN ordering?
diff --git a/java/certs/s_rsa1024_priv.pem b/java/certs/s_rsa1024_priv.pem
index 82aeccecb1b..260e640cd64 100644
--- a/java/certs/s_rsa1024_priv.pem
+++ b/java/certs/s_rsa1024_priv.pem
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCxC3IC6JrSQk7mthdMx4Bb4utbxppow4dcFtWc3l/flDr8TIsO
-Y0uNqueBWC+ooNgAV8K2FeH6LJZbuvIaguPzYIak/dCzYAbHFLYTyclxOkt/EhBL
-rnfhF4+5o5l53pDHlnRIoP/ogkp9dHvy7ZzU7hy1EocAa4bkRfAEWLA/nwIDAQAB
-AoGAN5XAVelxslHfM9A3wINiaXb1LftMv1ekR+Vja7zlnOyNGGlvvzSto+zkgleN
-nwPgzTrAhyqXqFQXYPVwzaIKrvjVvS5XHTQ9DVQcl0U5rLD3Rq/lV3uqC8aNj4MO
-d6xqgorLjbWpIJbYQqqWVuwtGiDVJHCVrCn2fy/sr0mWGQECQQDhxGvFue6/6EM0
-BfDGcX3+JLt6lhnED3iH1vA1MizeFwNU1hyf1Wa2T8S2VbtcqidQNZEDqtUY5T7Z
-o1tqhGfrAkEAyMDBVICHK++ED/FKAfA2Yx6Bz3brCQuM+7LwPds5KKj1XB4Q6pYf
-2zKKhhl1PuHgzX0r8xBdff6yFVvMfDzuHQJAU0iSOS6N1F1p7RcD6zCSud3zCxW0
-C49pdzLjCbyosITsxa72gD/I1Bg5CMo3g8eBGSWpiSDL25M1zDNm1bRiYQJBAJrH
-ywd85Tshuz+TeM0PyM8ZOVqcxFBAAJ4bc5Etkd9gjXRNlhtYTg1x5U3JGRW3j9y/
-UoBgMMUw91ryYTG0xJ0CQF9wTIGV1cA5rJkoFYl8E3cCspjQD5XQXaBa4v5lKT4x
-np1fnpubL7B+uLg7rchaFqkd3bH844j7SbHvx/sQtZE=
+MIICXgIBAAKBgQCqDI1Ak/ky2/ja98bjcm167Wzc0OgBh6fw1ToHJYtOFbx9Jam3
+vloMHtiRO7kAAy8ZKtK1SvBpezLD6YAiYt6YyS4jTwaVorCAe8uEnKlq6Pv2Cvuo
+AbEqsLFDs9dhuQZOiOBjznwIImA5vEXE1chYFmYCjSJWQo7wg5s1iLceTwIDAQAB
+AoGAGpsoJqiAXxLH1wrZlZC7zHYFiG8vPb4J6saR87hOGYORIEuaSGOCF09kNyUP
+Bw94eQmYOkFlaDucb8bDA55QkXniMOQW70UexCD/A1fQ9BNGM1I2gltViCK8e3va
+mcKGNNSKpOAffVH3PtNor7xd4Wt/bn0tPTUQCwpBmVY/RZECQQDYwZGt9HfG4xOX
+mxBqygugKOwW9SgIEjanHAbWCXTDXPfMgdOGTsNaGkd84wRyED7EE9ESQTzksKaJ
+phZtdxQLAkEAyNYnt4td624f2kY3NRxXcINiBcFhUicUlhNPVTBmkLNKlW+OENfm
+OadxdRMU8pVaDHIACErx3PaaaLCs3dGlTQJBAKxq1VndQ8W17WjEFPwNOdAtnRbp
+7ez1p/mnppxtKy8X7ZkEkGCemHA8xS7HWkrtNzA7Xyw5LpnvFpoZvm9WsF8CQQCu
+LCudnhwBhSvSnHpccQvT490qqJ7CJGpSDMUMWEFa1GKmXmySZuqerXxT0AympKfH
+i0ZD6tr+ik8246HHbX0xAkEA2DQcTsMfhAR0oAFxt67pii8kkBp1fT2NTyWOLbOX
+Op0+nNveVr0pXQ6b3JXGRcfK/Q4pcUQFIcvKwEf6nxAAFg==
-----END RSA PRIVATE KEY-----
diff --git a/java/certs/s_rsa1024_pub.pem b/java/certs/s_rsa1024_pub.pem
index b2731a3963a..5a83519d68e 100644
--- a/java/certs/s_rsa1024_pub.pem
+++ b/java/certs/s_rsa1024_pub.pem
@@ -5,71 +5,71 @@ Certificate:
Signature Algorithm: md5WithRSAEncryption
Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
Validity
- Not Before: Dec 29 22:03:47 2004 GMT
- Not After : Dec 29 22:03:47 2005 GMT
+ Not Before: Dec 31 03:36:55 2005 GMT
+ Not After : Dec 30 03:36:55 2010 GMT
Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceserver@some.net, CN=Ice Server
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public Key: (1024 bit)
Modulus (1024 bit):
- 00:b1:0b:72:02:e8:9a:d2:42:4e:e6:b6:17:4c:c7:
- 80:5b:e2:eb:5b:c6:9a:68:c3:87:5c:16:d5:9c:de:
- 5f:df:94:3a:fc:4c:8b:0e:63:4b:8d:aa:e7:81:58:
- 2f:a8:a0:d8:00:57:c2:b6:15:e1:fa:2c:96:5b:ba:
- f2:1a:82:e3:f3:60:86:a4:fd:d0:b3:60:06:c7:14:
- b6:13:c9:c9:71:3a:4b:7f:12:10:4b:ae:77:e1:17:
- 8f:b9:a3:99:79:de:90:c7:96:74:48:a0:ff:e8:82:
- 4a:7d:74:7b:f2:ed:9c:d4:ee:1c:b5:12:87:00:6b:
- 86:e4:45:f0:04:58:b0:3f:9f
+ 00:aa:0c:8d:40:93:f9:32:db:f8:da:f7:c6:e3:72:
+ 6d:7a:ed:6c:dc:d0:e8:01:87:a7:f0:d5:3a:07:25:
+ 8b:4e:15:bc:7d:25:a9:b7:be:5a:0c:1e:d8:91:3b:
+ b9:00:03:2f:19:2a:d2:b5:4a:f0:69:7b:32:c3:e9:
+ 80:22:62:de:98:c9:2e:23:4f:06:95:a2:b0:80:7b:
+ cb:84:9c:a9:6a:e8:fb:f6:0a:fb:a8:01:b1:2a:b0:
+ b1:43:b3:d7:61:b9:06:4e:88:e0:63:ce:7c:08:22:
+ 60:39:bc:45:c4:d5:c8:58:16:66:02:8d:22:56:42:
+ 8e:f0:83:9b:35:88:b7:1e:4f
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Basic Constraints:
CA:FALSE
X509v3 Subject Key Identifier:
- 0C:78:0B:9A:5E:E9:19:03:D8:CC:43:B9:D6:76:95:14:86:06:97:4A
+ EE:70:A0:D9:72:1A:4D:1E:9E:28:49:46:5D:30:35:0B:D2:5A:AD:9D
X509v3 Authority Key Identifier:
- keyid:55:0C:8A:3B:A7:A4:5B:49:3C:0B:5D:1B:39:44:C9:BB:79:C3:5F:82
+ keyid:5D:AB:9C:15:8E:87:F7:67:EE:CE:93:66:AF:AA:79:4D:8E:D8:E7:CC
DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
serial:00
Signature Algorithm: md5WithRSAEncryption
- b3:04:97:2a:b8:20:0a:8d:ed:53:81:d8:64:8e:cf:c7:f4:30:
- b4:8e:9d:34:bb:c7:5a:5d:52:07:75:37:9a:96:8d:ed:e8:26:
- ad:f3:47:4b:97:dd:73:cb:98:c0:56:b9:13:73:bb:06:5b:f8:
- 03:17:2d:e7:70:48:e4:57:f4:4f:f3:7b:b8:66:ec:ac:21:50:
- e9:69:55:9a:d2:62:06:12:5c:e1:0d:c2:5d:eb:f5:65:14:18:
- c7:82:aa:ec:db:80:c4:dc:f4:60:56:da:fa:74:be:f4:0d:22:
- 2e:16:10:08:2a:4a:7e:a5:c4:ec:a4:ed:46:88:09:ba:24:33:
- 62:ba:e4:83:cb:d5:18:51:6f:32:5e:d0:60:7d:ae:78:0b:db:
- a8:9e:c8:81:ba:ed:42:c4:37:c6:d6:56:cf:28:e8:55:e3:b9:
- 7d:3c:c8:ee:d4:2c:1f:2c:36:4a:5d:a2:c3:a1:d5:c1:d9:6b:
- 05:85:90:7b:06:3a:7b:88:b9:9a:34:a8:67:83:d0:27:9f:15:
- 3b:7a:30:19:10:10:52:d5:46:a3:8f:15:cf:2a:bd:69:cb:bf:
- 9a:e9:5e:a1:41:9a:6c:4c:32:b8:4b:a2:1e:70:14:00:8e:18:
- 3b:10:94:c9:3c:dd:1e:d2:ef:0b:a7:94:5a:00:df:e8:b6:4a:
- 84:0b:6c:b5
+ 1d:71:41:d9:9e:9e:87:23:1c:e2:df:46:2c:03:2f:1b:c9:06:
+ 68:4b:02:bd:9e:c0:88:34:ee:96:3d:08:dc:27:08:73:1a:bf:
+ 7f:19:42:14:1a:1d:4b:d2:f7:44:99:ff:4a:9e:7c:74:83:65:
+ ce:3e:e9:f5:3e:e0:60:cb:96:79:d1:67:6b:95:70:91:4a:3d:
+ de:3d:52:51:e1:7b:ec:d9:11:4b:3d:dd:b7:58:bc:06:b3:61:
+ 64:fb:af:c4:50:76:5f:e1:e9:11:80:70:d6:ec:14:95:02:ed:
+ 3d:a1:7c:65:c0:cf:c1:be:c0:2d:a9:e6:3e:33:fe:01:08:83:
+ 25:e6:ce:b5:bc:bf:93:a6:e0:97:ff:81:8a:95:07:39:e8:9c:
+ d0:ad:93:f3:46:61:83:c2:6c:65:83:26:14:55:3a:d9:6a:42:
+ e2:5a:93:c6:0f:97:1c:37:f2:a5:b4:9a:3c:a0:57:d0:8c:c3:
+ bb:9c:67:8e:32:c5:d5:d6:52:a4:2e:73:11:54:01:49:34:aa:
+ 82:0e:4a:54:fc:f5:38:c2:9d:f1:77:14:e8:1a:32:ff:a4:c1:
+ d1:90:fd:43:71:b6:e8:ac:b4:58:de:31:38:c7:9d:de:2f:61:
+ e3:99:48:d1:d0:38:89:c8:d7:9a:09:df:8a:f4:f3:5f:49:c8:
+ 82:fd:ea:94
-----BEGIN CERTIFICATE-----
MIIEKTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wNDEyMjkyMjAzNDdaFw0wNTEyMjkyMjAzNDdaMIGHMQswCQYD
+b21lLm5ldDAeFw0wNTEyMzEwMzM2NTVaFw0xMDEyMzAwMzM2NTVaMIGHMQswCQYD
VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEhMB8GCSqGSIb3DQEJARYSaWNlc2Vy
dmVyQHNvbWUubmV0MRMwEQYDVQQDEwpJY2UgU2VydmVyMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCxC3IC6JrSQk7mthdMx4Bb4utbxppow4dcFtWc3l/flDr8
-TIsOY0uNqueBWC+ooNgAV8K2FeH6LJZbuvIaguPzYIak/dCzYAbHFLYTyclxOkt/
-EhBLrnfhF4+5o5l53pDHlnRIoP/ogkp9dHvy7ZzU7hy1EocAa4bkRfAEWLA/nwID
-AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBQMeAuaXukZA9jMQ7nWdpUU
-hgaXSjCB0gYDVR0jBIHKMIHHgBRVDIo7p6RbSTwLXRs5RMm7ecNfgqGBq6SBqDCB
+AQUAA4GNADCBiQKBgQCqDI1Ak/ky2/ja98bjcm167Wzc0OgBh6fw1ToHJYtOFbx9
+Jam3vloMHtiRO7kAAy8ZKtK1SvBpezLD6YAiYt6YyS4jTwaVorCAe8uEnKlq6Pv2
+CvuoAbEqsLFDs9dhuQZOiOBjznwIImA5vEXE1chYFmYCjSJWQo7wg5s1iLceTwID
+AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBTucKDZchpNHp4oSUZdMDUL
+0lqtnTCB0gYDVR0jBIHKMIHHgBRdq5wVjof3Z+7Ok2avqnlNjtjnzKGBq6SBqDCB
pTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNv
bWV3aGVyZTEVMBMGA1UEChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9w
bWVudDEjMCEGA1UEAxMaWW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkq
-hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEAswSX
-KrggCo3tU4HYZI7Px/QwtI6dNLvHWl1SB3U3mpaN7egmrfNHS5fdc8uYwFa5E3O7
-Blv4Axct53BI5Ff0T/N7uGbsrCFQ6WlVmtJiBhJc4Q3CXev1ZRQYx4Kq7NuAxNz0
-YFba+nS+9A0iLhYQCCpKfqXE7KTtRogJuiQzYrrkg8vVGFFvMl7QYH2ueAvbqJ7I
-gbrtQsQ3xtZWzyjoVeO5fTzI7tQsHyw2Sl2iw6HVwdlrBYWQewY6e4i5mjSoZ4PQ
-J58VO3owGRAQUtVGo48Vzyq9acu/muleoUGabEwyuEuiHnAUAI4YOxCUyTzdHtLv
-C6eUWgDf6LZKhAtstQ==
+hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEAHXFB
+2Z6ehyMc4t9GLAMvG8kGaEsCvZ7AiDTulj0I3CcIcxq/fxlCFBodS9L3RJn/Sp58
+dINlzj7p9T7gYMuWedFna5VwkUo93j1SUeF77NkRSz3dt1i8BrNhZPuvxFB2X+Hp
+EYBw1uwUlQLtPaF8ZcDPwb7ALanmPjP+AQiDJebOtby/k6bgl/+BipUHOeic0K2T
+80Zhg8JsZYMmFFU62WpC4lqTxg+XHDfypbSaPKBX0IzDu5xnjjLF1dZSpC5zEVQB
+STSqgg5KVPz1OMKd8XcU6Boy/6TB0ZD9Q3G26Ky0WN4xOMed3i9h45lI0dA4icjX
+mgnfivTzX0nIgv3qlA==
-----END CERTIFICATE-----
diff --git a/java/certs/server.jks b/java/certs/server.jks
index f9ce0e8fd70..60883c1ed5a 100644
--- a/java/certs/server.jks
+++ b/java/certs/server.jks
Binary files differ