From ee643e7848d2f6d6297450b075829a871712ebbe Mon Sep 17 00:00:00 2001
From: Kevin Burke <kev@inburke.com>
Date: Mon, 3 Aug 2015 09:40:37 -0700
Subject: [PATCH] Set certificate expiration to August 2, 2018

Updates the gen-* scripts to take a `-days` argument, and set that `days`
argument to 3 years from now. I believe without this argument the certificates
default to a 30 day expiry. Code lifted from
https://github.com/shazow/urllib3/blob/master/dummyserver/certs/README.rst.

Generates new SSL certs with a long expiry.
---
 tests/ssl/ca/client-enc.key   | 52 +++++++++++++++++------------------
 tests/ssl/ca/client.crt       | 28 +++++++++----------
 tests/ssl/ca/client.csr       | 32 ++++++++++-----------
 tests/ssl/ca/client.key       | 50 ++++++++++++++++-----------------
 tests/ssl/ca/gen-client.sh    |  5 ++--
 tests/ssl/ca/gen-localhost.sh |  5 ++--
 tests/ssl/ca/localhost.crt    | 28 +++++++++----------
 tests/ssl/ca/localhost.csr    | 32 ++++++++++-----------
 tests/ssl/ca/localhost.key    | 50 ++++++++++++++++-----------------
 9 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/tests/ssl/ca/client-enc.key b/tests/ssl/ca/client-enc.key
index 308f638c3..e0f5348df 100644
--- a/tests/ssl/ca/client-enc.key
+++ b/tests/ssl/ca/client-enc.key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,374F554A54A7BDBAF97E9CDF43F02731
+DEK-Info: AES-128-CBC,DFE9B15161553AFAA662AC7EACFB6D35
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/ssl/ca/client.crt b/tests/ssl/ca/client.crt
index 7880c55ae..b5f687042 100644
--- a/tests/ssl/ca/client.crt
+++ b/tests/ssl/ca/client.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDLjCCApcCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
+MIIDLjCCApcCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1
 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG
 A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n
-ZXJzLmNvbTAeFw0xNTA2MzAwNzI0MzhaFw0xNTA3MzAwNzI0MzhaMIGPMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNVBAcTB09ha2xhbmQxEDAOBgNVBAoT
-B3JlcXVlc3QxGjAYBgNVBAsUEXJlcXVlc3RAbG9jYWxob3N0MRMwEQYDVQQDEwpU
+ZXJzLmNvbTAeFw0xNTA4MDMxNjM5MDJaFw0xODA4MDIxNjM5MDJaMIGPMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM
+B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRMwEQYDVQQDDApU
 ZXN0Q2xpZW50MR4wHAYJKoZIhvcNAQkBFg9kby5ub3RAZW1haWwubWUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJVEqXQjSTOqJLqTa30JwSHeGgCER+
-qwVPXgPV2uEGfc5tpGVmcyrPro8vk4vPLbTA7cirf4+H1a2doetQhSbNSkwiC3bO
-XhRe6GHyu8ta8xdeeEcxBWT+l3OPoRQi/Dk/E4ZVLV3VWgJJO/U09wLjSFtX5tAv
-k0QMvh65UZBAbkAZV9tqpRN5pJaYP5ccXcFa/kMF5dzeRTfdw6kVDyNpUtlJUtzS
-Je+DIqKRfOt+2dsQkzaRwYXx5Qd8QFGls3BlbfOUe2vbwcdpOuqxI7JmOxPEoaV8
-cAxCaHdALml9jYxGEyi90zDDP//Aa9DTX8YaJiGQbQpYzdpBXDoKPaF/AgMBAAEw
-DQYJKoZIhvcNAQELBQADgYEABB3RxkT3uOxZxRMivsRu7PozXAPDBhWsGDJ7N48e
-6mBYJcBg7T09WvwR3ZpuCQyNfODFRpiityrDT/m0OFFrJeAZbuT0Fv5+ZYPS1pQG
-kzdi16Vgez8dsZKYMZgn+VcL/c1ehugM4844y/WesS1x19JAdv1eebuU+gbsNHbB
-+Wc=
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYSkr4lssxol4y0Q/1mj9S1FAZ7qZx
+9pmK6cqBKmhdULp9RuicYUUG21HbAP6EAatzjR33KAgIlB1jpAfTEt+RqyRrAOdd
+jYjBWnVVjjDySvABwBACewAnhpAKquEZupKAShAZtu8G3W2W7XTtZMkyW//6ELu1
+sZojBoZ9M1TH7ENuG7vjLa7DVHd6qqtZyVFD8FjAN/yerfJm57t9K9h6HmZfwv1I
+T3PCtytKwEytaxMTDBJuXen68LomszlEXl2KnHnSNoERpoN0NxQIj+4syDf65xTH
+kJ5Ev2ZcGWOqMZNKbO+mxJYX5r4uk8GcugtD5I3rIVX8sZNKrQFzpFnBAgMBAAEw
+DQYJKoZIhvcNAQEFBQADgYEAKSut5ZyFcEDl4SSUKsnEXV1Z4sfWk1WTnZP8D8qX
+L/Mge0Gx36my6OtdJ0JFA1mO9gR3KyS9CDh3OgwWCg9HtoArriqLhBHE0oy7NYa2
+uRFraeLO5fGKk6FKePb3DRF8i9tFMQBhoVAZhX8f6hw+g3Xt5fDAHMumG2qMeuMQ
+l4I=
 -----END CERTIFICATE-----
diff --git a/tests/ssl/ca/client.csr b/tests/ssl/ca/client.csr
index e3580182f..0bb6f2e10 100644
--- a/tests/ssl/ca/client.csr
+++ b/tests/ssl/ca/client.csr
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/ssl/ca/client.key b/tests/ssl/ca/client.key
index af537fa92..4148e25ad 100644
--- a/tests/ssl/ca/client.key
+++ b/tests/ssl/ca/client.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/ssl/ca/gen-client.sh b/tests/ssl/ca/gen-client.sh
index c0f6d3be6..ed2fcfb38 100755
--- a/tests/ssl/ca/gen-client.sh
+++ b/tests/ssl/ca/gen-client.sh
@@ -8,7 +8,7 @@
 openssl genrsa -out client.key 2048
 
 # Create a certificate signing request
-openssl req -new -sha256 -key client.key -out client.csr -config client.cnf
+openssl req -new -sha256 -key client.key -out client.csr -config client.cnf -days 1095
 
 # Use the CSR and the CA key (previously generated) to create a certificate
 openssl x509 -req \
@@ -17,7 +17,8 @@ openssl x509 -req \
     -CAkey ca.key \
     -set_serial 0x`cat ca.srl` \
     -passin 'pass:password' \
-    -out client.crt
+    -out client.crt \
+    -days 1095
 
 # Encrypt with password
 openssl rsa -aes128 -in client.key -out client-enc.key -passout 'pass:password'
diff --git a/tests/ssl/ca/gen-localhost.sh b/tests/ssl/ca/gen-localhost.sh
index 21a1f367b..9c48673c4 100755
--- a/tests/ssl/ca/gen-localhost.sh
+++ b/tests/ssl/ca/gen-localhost.sh
@@ -8,7 +8,7 @@
 openssl genrsa -out localhost.key 2048
 
 # Create a certificate signing request
-openssl req -new -sha256 -key localhost.key -out localhost.csr -config localhost.cnf
+openssl req -new -sha256 -key localhost.key -out localhost.csr -config localhost.cnf -days 1095
 
 # Use the CSR and the CA key (previously generated) to create a certificate
 openssl x509 -req \
@@ -17,4 +17,5 @@ openssl x509 -req \
     -CAkey ca.key \
     -set_serial 0x`cat ca.srl` \
     -passin 'pass:password' \
-    -out localhost.crt
+    -out localhost.crt \
+    -days 1095
diff --git a/tests/ssl/ca/localhost.crt b/tests/ssl/ca/localhost.crt
index f526649d5..8beb1fc3c 100644
--- a/tests/ssl/ca/localhost.crt
+++ b/tests/ssl/ca/localhost.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDLTCCApYCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
+MIIDLTCCApYCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1
 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG
 A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n
-ZXJzLmNvbTAeFw0xNTA2MzAwNzI0NTNaFw0xNTA3MzAwNzI0NTNaMIGOMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNVBAcTB09ha2xhbmQxEDAOBgNVBAoT
-B3JlcXVlc3QxGjAYBgNVBAsUEXJlcXVlc3RAbG9jYWxob3N0MRIwEAYDVQQDEwls
+ZXJzLmNvbTAeFw0xNTA4MDMxNjM5NThaFw0xODA4MDIxNjM5NThaMIGOMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM
+B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRIwEAYDVQQDDAls
 b2NhbGhvc3QxHjAcBgkqhkiG9w0BCQEWD2RvLm5vdEBlbWFpbC5tZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANOpX00BXKdXYmU69Xhg7YRpg/PmbH1j
-yCvc/rhgLUg7zHK2dckdZch5GoQnTMwA7EALgLeFGNSIpeRlaZaqOzy9DCSL8d1D
-YmIxBsywk/QCSwOTE2f2CgLNwRAY9568hAVoXdVnBSEPJQaJDK/MHkDYdY4O0Ou1
-wjiaOaze5vf/b1rYvmWxwY46d71/ykIK/6DzVQDrCOOeegsYZAY0FEI23RZqE10X
-hxLQg5VJT7nd4FHQw2Y2qmPznjtxQ8dkFCz3JlfClECjG0Z5GTvGRVfAL04k2H12
-aGETbDkkAaAsieNugFkphnbeAgguzfQGDFZjPI6RNSZnRiVIpoSkTa0CAwEAATAN
-BgkqhkiG9w0BAQsFAAOBgQAnkyp4oivuflGQYarlXvepZzVnmC2ox8Dwxa/hNVsi
-jiJzBdpUEaUqLTlTpYiJr6fEvAfP5WRW1HoLVCIQMvg1ieav+zMfbMf4ftv5zBIe
-XwMaQB3NDb+3zzVTdN4J2OWh1tRvVp1/x7wAn3tQKq2+80aUKScTfvguaPUJrUGr
-TQ==
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5d+ffEqcykWv/O6OLvsdv3y2h/jK2R
+lE4SSgqhCoS2J4X08B6LGHOs+IcMOtGV29dLy/wnMKdqVc/CqGd0KB6zkVERWt0H
+mcoT3ATeIcs8kyO+i++LQB+5YNcSbmXZE4he/OoMWLJwLFzbCzSHCZGdutnAO8pl
+dV1AWMKYncpDQjxVOL2Ji2sgJFa8Jfl2c6bzpYJxHrW+bdWhq7QjIqM4TtcRkmW4
+NGMmf2sNnTC5pvI6/bFvQSSgYQ5ZjR6ytvFxeyo0cwyW5azTdgkRzXHan2m2Dh4b
+kcLu9ReRVuJ6P6fATrUQD91mM85Bb8Qzn+L3rOKSuAcmgx8wrTHyjeUCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQAFhiBnCVsgk3Gn8kqKoAMqEd4Ckk3w6Fuj+C468lDM
+HGrX6e1pPO8UwVNUye1U2nRkVmO92IPsENrnLvIoqbtXR4w6T0DWg+ilRgJsV/Ra
+hVZBJxYthAtvyfNBnwd9FV3jC3waEsKRcnLDDkkBOfYtMeUzHuCBAwf5c7vuNC+N
+xQ==
 -----END CERTIFICATE-----
diff --git a/tests/ssl/ca/localhost.csr b/tests/ssl/ca/localhost.csr
index 8a20ca42d..27036fd03 100644
--- a/tests/ssl/ca/localhost.csr
+++ b/tests/ssl/ca/localhost.csr
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/ssl/ca/localhost.key b/tests/ssl/ca/localhost.key
index 96119a7fb..260c6a340 100644
--- a/tests/ssl/ca/localhost.key
+++ b/tests/ssl/ca/localhost.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA06lfTQFcp1diZTr1eGDthGmD8+ZsfWPIK9z+uGAtSDvMcrZ1
-yR1lyHkahCdMzADsQAuAt4UY1Iil5GVplqo7PL0MJIvx3UNiYjEGzLCT9AJLA5MT
-Z/YKAs3BEBj3nryEBWhd1WcFIQ8lBokMr8weQNh1jg7Q67XCOJo5rN7m9/9vWti+
-ZbHBjjp3vX/KQgr/oPNVAOsI4556CxhkBjQUQjbdFmoTXReHEtCDlUlPud3gUdDD
-ZjaqY/OeO3FDx2QULPcmV8KUQKMbRnkZO8ZFV8AvTiTYfXZoYRNsOSQBoCyJ426A
-WSmGdt4CCC7N9AYMVmM8jpE1JmdGJUimhKRNrQIDAQABAoIBAGbWqikd+kiMGpCY
-vt+IKJ7nLWd5k0ixDHbTXydyA05PT5yErmHS2Ls4q/t9pMCRyjer3xRLpK7O3dtE
-srKzbyipqZawMAmTTd/rdiRJvvkVjCDmes1OK7sFAUKy/syvR23hMYYYEdPoKdMt
-D27yu9hB04v8AuIjY4Rg2pj1jD79h/c5/g5hy0/ZjNVUTVgjtJTwiteVekf1M7SR
-0o3+uIlBTmC+BSyNXChnR9yie2ztmdl6Yhcw29xMJkH02oYtEhhNNneWn0IycSmt
-HWlPBMsTb0ELnMLu3Q6VH4Su4MljOvaEWQjKnD5getYImnEY83Tb2T+5sb0Qyge+
-CS706HkCgYEA+dVZQjrNNlB7RvQfQC9JshWZvq1K6q5rEUlZTmTaaM6uV4KhrgdO
-k0KCdlnwVdeXjxEzJfSAKkLz0Na8/83KR5fqbVrQI3yOdzyl3zZeh82V2YbAa0l/
-tmJKGG0IAG4f+Z0Xwn8FqKjQG495Z00ekaVC73gF20cqAGkfxAMF8GsCgYEA2OLS
-t70altZZc2V/tj1jonhyl6kFQip2xLuXgQrFyIXlsFDfjQOyBHlNxrVStGS8D36+
-nQeQsHyF5mVe3S/vsW3eqkC+vQo8x7OWzsCIo1RcpRQdvj0dp96kbKAc7OrRNjM1
-u/Yvd6khVJx5Qp7WVYzO9GGo4IwCF2fvcRcj4EcCgYEAlUckkU0/Rv/p2SiO77QR
-rcX4WpWDGRzkvqx8HzplwpAUXheg8bJOAfGQsJTm5PPwDD0zua8RUa81rghRX+uf
-vQ2JtpO3oCyRl692URxUeYKe0h4RJUoCdIDgUx361P74Phbelol9YRyVVJJy8QWE
-iXQcvaeSoEYyU5J8t4sy5kcCgYACPY2Zsk1lA3/XDlRcaJPv6LieUnOodFHXxGxT
-O+5BHQj7Ykp85W3gV/RyugrJrES5EEEd1Ccte4vSjneFZ2pdddoX/iU6RLHOCk/j
-gN+oeEWguu13up/kzQr7yEekNuTEX5ENiQSCgu/CNP+XrZZfOd4lbiDVePzIix1R
-GMEZHwKBgEjqwn5ecKaejfsoRTvWdbOsWyz+6jV9AkA6PVYhpiQgeHNXDCvXeU9I
-menG65LXqyqbeOV/BzG5b+R0VchiA1yo2jRl7Pnr8EKe96OWuUtOGDs9jusVxBhP
-XNRVLVEE9kMLrzxQW4SFbjxaFNhnxZnjmaVTINhVXlEqK5mRVYNN
+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
 -----END RSA PRIVATE KEY-----