diff --git a/play-scala-tls-example/scripts/client.crt b/play-scala-tls-example/scripts/client.crt
index 30bb2badf..845de4888 100644
--- a/play-scala-tls-example/scripts/client.crt
+++ b/play-scala-tls-example/scripts/client.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICRjCCAemgAwIBAgIEeFMEOzAMBggqhkjOPQQDAgUAMH0xCzAJBgNVBAYTAlVT
+MIICRDCCAemgAwIBAgIEEo3a6TAMBggqhkjOPQQDAgUAMH0xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMREw
-DwYDVQQDEwhjbGllbnRjYTAeFw0xOTEyMjAwOTA2MzhaFw0yMDAzMTkwOTA2Mzha
+DwYDVQQDEwhjbGllbnRjYTAeFw0yMDA0MDgxOTEzNDdaFw0zMDA0MDYxOTEzNDda
 MHsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
 YW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsT
 C0V4YW1wbGUgT3JnMQ8wDQYDVQQDEwZjbGllbnQwWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAAQ21e3Z0S3pgCavhPI2VjoJF5qnT1rW3t3qlCc8XT+/kqC0wR9xhHE3
-aa/1zi5QGXU2edjE5FZ+RluFr9nRIwDeo1cwVTAfBgNVHSMEGDAWgBSgt6W3KWY9
-qaJS1HrLsvE8fvEzdzATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUvutA
-1tChiaIizYhSSvTmyvUaMXowDAYIKoZIzj0EAwIFAANJADBGAiEA0wwPxU72jCfC
-PV+D4yxU9NGgfpgdUmcgSLZhp7Zx2sACIQDlWSfAkmqqlUqFj1iQLt/9TbopaQ7J
-IQkCY+vONTbprA==
+PQMBBwNCAAQaqHu/ZPPfs4BwuFmuFTNkdZEErxUET+RqC8kJrGmLrw49O/1p/XnW
+kvMPJTUvC9HA2IMjXM3HjMKGvp6UFei1o1cwVTAfBgNVHSMEGDAWgBQ7/Xx8ajCu
+3d91cYKAShF6K2MpGDATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUw5gi
+0RaTqGJJLiw6nSnajD/GN7gwDAYIKoZIzj0EAwIFAANHADBEAiB7NsJV0wuZkiMu
+PCZkwVoOr96Sc3uBbv9FHNB6r5YVqAIgQbVgqQyOkSoyBT22AEWebBjzf6w5CqqL
+axRShKyOS0A=
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/client.csr b/play-scala-tls-example/scripts/client.csr
index c50b91370..59221bc25 100644
--- a/play-scala-tls-example/scripts/client.csr
+++ b/play-scala-tls-example/scripts/client.csr
@@ -1,10 +1,10 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBaTCCAQ0CAQAwezELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
+MIIBajCCAQ0CAQAwezELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
 FjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFu
 eTEUMBIGA1UECxMLRXhhbXBsZSBPcmcxDzANBgNVBAMTBmNsaWVudDBZMBMGByqG
-SM49AgEGCCqGSM49AwEHA0IABDbV7dnRLemAJq+E8jZWOgkXmqdPWtbe3eqUJzxd
-P7+SoLTBH3GEcTdpr/XOLlAZdTZ52MTkVn5GW4Wv2dEjAN6gMDAuBgkqhkiG9w0B
-CQ4xITAfMB0GA1UdDgQWBBS+60DW0KGJoiLNiFJK9ObK9RoxejAMBggqhkjOPQQD
-AgUAA0gAMEUCIGRuJlN6cLYvtfJ4x/vM7XkB/STxN9Xzmeih/UPh9tVAAiEAiwDb
-LXN7NN02Fym8QmPO8CCIm14N3YjcxZl7ZcrW8aY=
+SM49AgEGCCqGSM49AwEHA0IABBqoe79k89+zgHC4Wa4VM2R1kQSvFQRP5GoLyQms
+aYuvDj07/Wn9edaS8w8lNS8L0cDYgyNczceMwoa+npQV6LWgMDAuBgkqhkiG9w0B
+CQ4xITAfMB0GA1UdDgQWBBTDmCLRFpOoYkkuLDqdKdqMP8Y3uDAMBggqhkjOPQQD
+AgUAA0kAMEYCIQCyQLkVa8yjp4WzzlsME7N0Xo6+kwL9atpInBQ7iEETlQIhAIwe
+VcoPuh4IziDxWDRmFwUiHRkpMvLoW1kC43YwOeFr
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/play-scala-tls-example/scripts/client.p12 b/play-scala-tls-example/scripts/client.p12
index 595b147a8..7308cd9a0 100644
Binary files a/play-scala-tls-example/scripts/client.p12 and b/play-scala-tls-example/scripts/client.p12 differ
diff --git a/play-scala-tls-example/scripts/clientca.crt b/play-scala-tls-example/scripts/clientca.crt
index a91e1ef7e..a99b572ae 100644
--- a/play-scala-tls-example/scripts/clientca.crt
+++ b/play-scala-tls-example/scripts/clientca.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICMjCCAdagAwIBAgIESOUMdTAMBggqhkjOPQQDAgUAMH0xCzAJBgNVBAYTAlVT
+MIICMjCCAdagAwIBAgIEV99MYTAMBggqhkjOPQQDAgUAMH0xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMREw
-DwYDVQQDEwhjbGllbnRjYTAeFw0xOTEyMjAwOTA2MzZaFw0yOTEyMTcwOTA2MzZa
+DwYDVQQDEwhjbGllbnRjYTAeFw0yMDA0MDgxOTEzNDZaFw0zMDA0MDYxOTEzNDZa
 MH0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
 YW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsT
 C0V4YW1wbGUgT3JnMREwDwYDVQQDEwhjbGllbnRjYTBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABEvYt3gthdVDUQVyXGYwGFdvUiaDl57AzaDUal+2N//zuC8gofeR
-GumtUu1tj6z4KhTfderIsyfq1hlfjBnaEgCjQjBAMA8GA1UdEwEB/wQFMAMBAf8w
-DgYDVR0PAQH/BAQDAgIEMB0GA1UdDgQWBBSgt6W3KWY9qaJS1HrLsvE8fvEzdzAM
-BggqhkjOPQQDAgUAA0gAMEUCIQCMuz58F7+UB3UAh9/TxhB/OvFcf5U/kiKt2qRa
-xVqI0gIgOzyOb+454kIkDIQ18fSmPItjqUvjdiXS1shx55vnLAE=
+SM49AwEHA0IABDOdgsbW9lDgqdBFNAjdi4DcovRXU1UA5CgoUSejQKwq/m7gny4i
+1qGZmAXUqBb41zDcBnmk/XVprYPU3s4fC7qjQjBAMA8GA1UdEwEB/wQFMAMBAf8w
+DgYDVR0PAQH/BAQDAgIEMB0GA1UdDgQWBBQ7/Xx8ajCu3d91cYKAShF6K2MpGDAM
+BggqhkjOPQQDAgUAA0gAMEUCIAXu5MuoSWFOzgYzM+FQv3KzRaG7JbDtR/c4qNbW
+ZOH3AiEApD6YSnx1prbpZhPLMBnaVGZG5S2iIkeuiS00RqNn2nc=
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/clientca.p12 b/play-scala-tls-example/scripts/clientca.p12
index 22dbbe315..cdcb32830 100644
Binary files a/play-scala-tls-example/scripts/clientca.p12 and b/play-scala-tls-example/scripts/clientca.p12 differ
diff --git a/play-scala-tls-example/scripts/example.com.crt b/play-scala-tls-example/scripts/example.com.crt
index f3dace49e..5afe2a263 100644
--- a/play-scala-tls-example/scripts/example.com.crt
+++ b/play-scala-tls-example/scripts/example.com.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICdDCCAhigAwIBAgIEOHFr8zAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
+MIICdTCCAhigAwIBAgIEZqEYhjAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRIw
-EAYDVQQDEwlleGFtcGxlQ0EwHhcNMTkxMjIwMDkwNjQyWhcNMjAwMzE5MDkwNjQy
+EAYDVQQDEwlleGFtcGxlQ0EwHhcNMjAwNDA4MTkxMzUwWhcNMzAwNDA2MTkxMzUw
 WjCBgDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
 DVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UE
 CxMLRXhhbXBsZSBPcmcxFDASBgNVBAMTC2V4YW1wbGUuY29tMFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAEHRs8SJJNQnX6NvW/kMFIy96nyj9N7hiHPYTjyqrY3E9T
-4YFFzwd2JQeFI3bfxlHeMymLUtyENDbvnaifDRRF96N/MH0wHwYDVR0jBBgwFoAU
-WEfn0+3M/JXA/OAkpOmaml3NamYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDgYDVR0P
-AQH/BAQDAgWgMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMB0GA1UdDgQWBBQ099uf
-5kx+XwxqzZkM+w6IT41LbTAMBggqhkjOPQQDAgUAA0gAMEUCIGd8H1OgQKkEV0xy
-XkhLtLn6h0tGrMMh9nAi5tpR6t5EAiEA6MyzSopPJndf4pRqlPzWY4qI7igfpgF4
-ovXGPcKvpnQ=
+AQYIKoZIzj0DAQcDQgAE4vzTH4SlAL6kvufhW4PpbPcY00/dz+SD64V0m0Igy2E+
+xD79eD5NrZleC/3hX7D/SfJoL93Q3spKtyIsgxmZ6qN/MH0wHwYDVR0jBBgwFoAU
+ebOV73KaB/rW66mt93T9eSt6S9AwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDgYDVR0P
+AQH/BAQDAgWgMBYGA1UdEQQPMA2CC2V4YW1wbGUuY29tMB0GA1UdDgQWBBRFjEpu
+BU2phJis7ZH60e+gJoaxoTAMBggqhkjOPQQDAgUAA0kAMEYCIQCWxJsiAbYQpJrX
+H5SDA/Yvcz1Vkt1jTOr0Cc0Q1KUnxAIhAM4TFIvH07RxzNX43UjEJAZMqWLTQ2hH
+dtg1xyt0SSxr
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/example.com.csr b/play-scala-tls-example/scripts/example.com.csr
index 36cfb7a62..1fc418528 100644
--- a/play-scala-tls-example/scripts/example.com.csr
+++ b/play-scala-tls-example/scripts/example.com.csr
@@ -1,10 +1,10 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBbjCCARMCAQAwgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MIIBbzCCARMCAQAwgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
 MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBh
 bnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRQwEgYDVQQDEwtleGFtcGxlLmNvbTBZ
-MBMGByqGSM49AgEGCCqGSM49AwEHA0IABB0bPEiSTUJ1+jb1v5DBSMvep8o/Te4Y
-hz2E48qq2NxPU+GBRc8HdiUHhSN238ZR3jMpi1LchDQ2752onw0URfegMDAuBgkq
-hkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQ099uf5kx+XwxqzZkM+w6IT41LbTAMBggq
-hkjOPQQDAgUAA0cAMEQCIHmVYqisKrR8zD++p7xNkSFsnHTwbD+t1ftTi7OYQfZq
-AiAGO56kQpOLICryA5/i81buahfH+qLc5EbAbFCr5epgLA==
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABOL80x+EpQC+pL7n4VuD6Wz3GNNP3c/k
+g+uFdJtCIMthPsQ+/Xg+Ta2ZXgv94V+w/0nyaC/d0N7KSrciLIMZmeqgMDAuBgkq
+hkiG9w0BCQ4xITAfMB0GA1UdDgQWBBRFjEpuBU2phJis7ZH60e+gJoaxoTAMBggq
+hkjOPQQDAgUAA0gAMEUCIHq/4SmQwvgK2gOZ4JjDttfWaZKI5j0ux1DdpBg2K5xY
+AiEAsXcaxDz8gAf3ozbNTl9diByJwXWDPfF0NngN9wlh8eY=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/play-scala-tls-example/scripts/example.com.p12 b/play-scala-tls-example/scripts/example.com.p12
index 74800784e..3d5f3d596 100644
Binary files a/play-scala-tls-example/scripts/example.com.p12 and b/play-scala-tls-example/scripts/example.com.p12 differ
diff --git a/play-scala-tls-example/scripts/exampleca.crt b/play-scala-tls-example/scripts/exampleca.crt
index 887a71e22..cb2ca3ca1 100644
--- a/play-scala-tls-example/scripts/exampleca.crt
+++ b/play-scala-tls-example/scripts/exampleca.crt
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICNTCCAdigAwIBAgIEVABMrDAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
+MIICNTCCAdigAwIBAgIEYr2VmTAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRIw
-EAYDVQQDEwlleGFtcGxlQ0EwHhcNMTkxMjIwMDkwNjM1WhcNNDcwNTA2MDkwNjM1
+EAYDVQQDEwlleGFtcGxlQ0EwHhcNMjAwNDA4MTkxMzQ1WhcNNDcwODI0MTkxMzQ1
 WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
 U2FuIEZyYW5jaXNjbzEYMBYGA1UEChMPRXhhbXBsZSBDb21wYW55MRQwEgYDVQQL
 EwtFeGFtcGxlIE9yZzESMBAGA1UEAxMJZXhhbXBsZUNBMFkwEwYHKoZIzj0CAQYI
-KoZIzj0DAQcDQgAEXAYJtHe6nb1WDw9juLm5sCfJ1BpTVy3J1j5rLuRS/kbaAQYc
-94cAqf+a/+/e3L3CVAFxD7fNX5meMr2YEQko+aNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAgQwHQYDVR0OBBYEFFhH59PtzPyVwPzgJKTpmppdzWpm
-MAwGCCqGSM49BAMCBQADSQAwRgIhAOPNS7mzEkosOqHs4YlgVngBNW5IaMuS8Pcy
-VMCexrinAiEA6wILO2gUhMWuOkwz+ofxDt33fyPBqFzuV3/FRMuYeMc=
+KoZIzj0DAQcDQgAEZILMEPLOvxMYjuXjNMBm+RDZUIC3YIVZXVxBaKLUkwEAdXcs
+UzhgBB3A2xSE3LUopFhMIk1NYZ3lHp86ncqRR6NCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAgQwHQYDVR0OBBYEFHmzle9ymgf61uuprfd0/XkrekvQ
+MAwGCCqGSM49BAMCBQADSQAwRgIhAO84NIEZfhYONg2Gt2kpSPV7ZTrlTS+IAAaC
+/jO5PsyCAiEAw5wIPsbywetxygFOTychX4lGb7Pl9XptyMCm5ct1OD8=
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/exampleca.p12 b/play-scala-tls-example/scripts/exampleca.p12
index acc903619..3832b9807 100644
Binary files a/play-scala-tls-example/scripts/exampleca.p12 and b/play-scala-tls-example/scripts/exampleca.p12 differ
diff --git a/play-scala-tls-example/scripts/exampletrust.p12 b/play-scala-tls-example/scripts/exampletrust.p12
index a81da23aa..7e114ff92 100644
Binary files a/play-scala-tls-example/scripts/exampletrust.p12 and b/play-scala-tls-example/scripts/exampletrust.p12 differ
diff --git a/play-scala-tls-example/scripts/gen-example.com.sh b/play-scala-tls-example/scripts/gen-example.com.sh
index 99135e9bd..1151a9060 100755
--- a/play-scala-tls-example/scripts/gen-example.com.sh
+++ b/play-scala-tls-example/scripts/gen-example.com.sh
@@ -35,7 +35,9 @@ keytool -gencert -v \
   -ext KeyUsage:critical="digitalSignature,keyEncipherment" \
   -ext EKU="serverAuth" \
   -ext SAN="DNS:example.com" \
-  -rfc
+  -rfc \
+  -validity 3650
+
 
 # Tell example.com.p12 it can trust exampleca as a signer.
 keytool -import -v \
diff --git a/play-scala-tls-example/scripts/gen-one.example.com.sh b/play-scala-tls-example/scripts/gen-one.example.com.sh
index ce2e32000..26af4024f 100755
--- a/play-scala-tls-example/scripts/gen-one.example.com.sh
+++ b/play-scala-tls-example/scripts/gen-one.example.com.sh
@@ -34,7 +34,9 @@ keytool -gencert -v \
   -ext KeyUsage:critical="digitalSignature,keyEncipherment" \
   -ext EKU="serverAuth" \
   -ext SAN="DNS:one.example.com" \
-  -rfc
+  -rfc \
+  -validity 3650
+
 
 # Import the signed certificate back into example.com.p12
 keytool -import -v \
diff --git a/play-scala-tls-example/scripts/gen-two.example.com.sh b/play-scala-tls-example/scripts/gen-two.example.com.sh
index 62c4a10eb..72af316eb 100755
--- a/play-scala-tls-example/scripts/gen-two.example.com.sh
+++ b/play-scala-tls-example/scripts/gen-two.example.com.sh
@@ -34,7 +34,8 @@ keytool -gencert -v \
   -ext KeyUsage:critical="digitalSignature,keyEncipherment" \
   -ext EKU="serverAuth" \
   -ext SAN="DNS:two.example.com" \
-  -rfc
+  -rfc \
+  -validity 3650
 
 # Import the signed certificate back into example.com.p12
 keytool -import -v \
diff --git a/play-scala-tls-example/scripts/gen-wildcard.example.com.sh b/play-scala-tls-example/scripts/gen-wildcard.example.com.sh
index c6d327b05..f5ee9b317 100755
--- a/play-scala-tls-example/scripts/gen-wildcard.example.com.sh
+++ b/play-scala-tls-example/scripts/gen-wildcard.example.com.sh
@@ -34,7 +34,8 @@ keytool -gencert -v \
   -outfile wildcard.example.com.crt \
   -ext KeyUsage:critical="digitalSignature,keyEncipherment" \
   -ext EKU="serverAuth" \
-  -rfc
+  -rfc \
+  -validity 3650
 
 # Import the signed certificate back into example.com.p12 
 keytool -import -v \
diff --git a/play-scala-tls-example/scripts/genclient.sh b/play-scala-tls-example/scripts/genclient.sh
index a65215c4f..03ab93285 100755
--- a/play-scala-tls-example/scripts/genclient.sh
+++ b/play-scala-tls-example/scripts/genclient.sh
@@ -44,7 +44,8 @@ keytool -gencert -v \
   -infile client.csr \
   -outfile client.crt \
   -ext EKU="clientAuth" \
-  -rfc
+  -rfc \
+  -validity 3650
 
 # Export the client-ca certificate from the keystore.  This goes to nginx under "ssl_client_certificate"
 # and is presented in the CertificateRequest.
diff --git a/play-scala-tls-example/scripts/one.example.com.crt b/play-scala-tls-example/scripts/one.example.com.crt
index 83015ec9e..d27c057bb 100644
--- a/play-scala-tls-example/scripts/one.example.com.crt
+++ b/play-scala-tls-example/scripts/one.example.com.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICfjCCAiKgAwIBAgIEZ2Q5ZTAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
+MIICfjCCAiKgAwIBAgIEU780nTAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRIw
-EAYDVQQDEwlleGFtcGxlQ0EwHhcNMTkxMjIwMDkwNjQ2WhcNMjAwMzE5MDkwNjQ2
+EAYDVQQDEwlleGFtcGxlQ0EwHhcNMjAwNDA4MTkxMzUyWhcNMzAwNDA2MTkxMzUy
 WjCBhDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
 DVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UE
 CxMLRXhhbXBsZSBPcmcxGDAWBgNVBAMTD29uZS5leGFtcGxlLmNvbTBZMBMGByqG
-SM49AgEGCCqGSM49AwEHA0IABDHcRBanJiTgjdiDAggCBVCNafYRIOLuvs1YKusS
-2GdE5YOHQVo9zXynuiXIAenzSBElF3Bu2WDjaI+MlEKx5najgYQwgYEwHwYDVR0j
-BBgwFoAUWEfn0+3M/JXA/OAkpOmaml3NamYwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
+SM49AgEGCCqGSM49AwEHA0IABBxwEvuijYN1h341AS4Wo3S+w6s+zwOae1Si6Ejm
+PQdoH2H2oSSmB1WF79LuZCdBV9Q1LNsSVkzfqfeuTycap0GjgYQwgYEwHwYDVR0j
+BBgwFoAUebOV73KaB/rW66mt93T9eSt6S9AwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
 DgYDVR0PAQH/BAQDAgWgMBoGA1UdEQQTMBGCD29uZS5leGFtcGxlLmNvbTAdBgNV
-HQ4EFgQUD1fzCUNAsBYwNDwi2b5aWOmQe/gwDAYIKoZIzj0EAwIFAANIADBFAiEA
-0hzxOwKhWvbt7zGYiebBQpTS7aEayI8XFYNTy/gw5WkCIE2efeP7RVZme7mCkMcj
-rueSK1VP5tZwyhFoD/rclOXG
+HQ4EFgQUOA9CUGX9I0CVVpOUUS46GxdHizwwDAYIKoZIzj0EAwIFAANIADBFAiAd
+TZv4jqGzxaZyUJXJxtTJW62Rwof0w8VAuzVSGJlYzAIhAKGBxbWMP5gsWnPFWP98
+/PufCIu/OCvnU22ZeFqPLnyO
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/one.example.com.csr b/play-scala-tls-example/scripts/one.example.com.csr
index 7efd007df..ba5a81200 100644
--- a/play-scala-tls-example/scripts/one.example.com.csr
+++ b/play-scala-tls-example/scripts/one.example.com.csr
@@ -1,10 +1,10 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBczCCARcCAQAwgYQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MIIBcjCCARcCAQAwgYQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
 MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBh
 bnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRgwFgYDVQQDEw9vbmUuZXhhbXBsZS5j
-b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQx3EQWpyYk4I3YgwIIAgVQjWn2
-ESDi7r7NWCrrEthnROWDh0FaPc18p7olyAHp80gRJRdwbtlg42iPjJRCseZ2oDAw
-LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUD1fzCUNAsBYwNDwi2b5aWOmQe/gw
-DAYIKoZIzj0EAwIFAANIADBFAiAP3vWakBQsopVguPk1k62QCQlI4H0fb6fefVKi
-cbYAoQIhAKZkiWRmKYPtHi22yZbhUUaVu+UxM1Bi50Drrivoilrc
+b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQccBL7oo2DdYd+NQEuFqN0vsOr
+Ps8DmntUouhI5j0HaB9h9qEkpgdVhe/S7mQnQVfUNSzbElZM36n3rk8nGqdBoDAw
+LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUOA9CUGX9I0CVVpOUUS46GxdHizww
+DAYIKoZIzj0EAwIFAANHADBEAiAzd8bUNlsOQLgdznFtWiB64Ojxdst8zlXGL6MF
+8rKK7AIgSE46/pAC0I3fTPkHpyAvfMTt4cPMmwfzrqyOL9RliXM=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/play-scala-tls-example/scripts/password b/play-scala-tls-example/scripts/password
index e0535e330..b85f33017 100644
--- a/play-scala-tls-example/scripts/password
+++ b/play-scala-tls-example/scripts/password
@@ -1 +1 @@
-nLonMwynC4
+3fKrFtcFP9
diff --git a/play-scala-tls-example/scripts/two.example.com.crt b/play-scala-tls-example/scripts/two.example.com.crt
index 2a4b7b4aa..7c1750732 100644
--- a/play-scala-tls-example/scripts/two.example.com.crt
+++ b/play-scala-tls-example/scripts/two.example.com.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICfzCCAiKgAwIBAgIEWn6oFzAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
+MIICfzCCAiKgAwIBAgIECeqXbDAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRIw
-EAYDVQQDEwlleGFtcGxlQ0EwHhcNMTkxMjIwMDkwNjQ4WhcNMjAwMzE5MDkwNjQ4
+EAYDVQQDEwlleGFtcGxlQ0EwHhcNMjAwNDA4MTkxMzU0WhcNMzAwNDA2MTkxMzU0
 WjCBhDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
 DVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UE
 CxMLRXhhbXBsZSBPcmcxGDAWBgNVBAMTD3R3by5leGFtcGxlLmNvbTBZMBMGByqG
-SM49AgEGCCqGSM49AwEHA0IABAm03bY+9FqohTR419cdDx8q8JgC3npBTHPugOrd
-GPQgjl93L/SFdE54OtzEI8iqU0WQRpUyYyHtXyIsS4E/u6WjgYQwgYEwHwYDVR0j
-BBgwFoAUWEfn0+3M/JXA/OAkpOmaml3NamYwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
+SM49AgEGCCqGSM49AwEHA0IABFPjENke6m2hA5Z3WIQyaf9PiWwp1YcWXCmfLNMu
+YTHM4igVkzaGQ5ZLrFAA/sqoPhXpBLczodtalT1hKXSzLeGjgYQwgYEwHwYDVR0j
+BBgwFoAUebOV73KaB/rW66mt93T9eSt6S9AwEwYDVR0lBAwwCgYIKwYBBQUHAwEw
 DgYDVR0PAQH/BAQDAgWgMBoGA1UdEQQTMBGCD3R3by5leGFtcGxlLmNvbTAdBgNV
-HQ4EFgQU2mM50wL0mM6endcoqXziJCm03ZwwDAYIKoZIzj0EAwIFAANJADBGAiEA
-7prGnuAk9LAQgD0UOFkcIu+i226+oIewpcISxuTd+Z0CIQDsjRWiHBDbqOZinVF8
-9t5EzU6fz2jDblV0VgH6auNZww==
+HQ4EFgQUIWFc+NvAwbPeCdbHL1zVKbPCGNIwDAYIKoZIzj0EAwIFAANJADBGAiEA
+rs/JdT/Hk73gQCN5RL3GduAEoO3EpQbLFyoUNKblX70CIQDFdhqtWouA1r5t09JB
+TTlxqrwkIELL4wqKEBDzwOZcGQ==
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/two.example.com.csr b/play-scala-tls-example/scripts/two.example.com.csr
index a59814e63..8807a64de 100644
--- a/play-scala-tls-example/scripts/two.example.com.csr
+++ b/play-scala-tls-example/scripts/two.example.com.csr
@@ -1,10 +1,10 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBcjCCARcCAQAwgYQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MIIBdDCCARcCAQAwgYQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
 MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBh
 bnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRgwFgYDVQQDEw90d28uZXhhbXBsZS5j
-b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQJtN22PvRaqIU0eNfXHQ8fKvCY
-At56QUxz7oDq3Rj0II5fdy/0hXROeDrcxCPIqlNFkEaVMmMh7V8iLEuBP7uloDAw
-LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU2mM50wL0mM6endcoqXziJCm03Zww
-DAYIKoZIzj0EAwIFAANHADBEAiAvHrIkJZjBI1OwvipKA42Owgpz9REmxXxqOLsC
-u8JJlAIgTwBetM/pqW2n2+NvK8sXdAy48B2XWxjBZTJMdtp5iig=
+b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAART4xDZHuptoQOWd1iEMmn/T4ls
+KdWHFlwpnyzTLmExzOIoFZM2hkOWS6xQAP7KqD4V6QS3M6HbWpU9YSl0sy3hoDAw
+LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUIWFc+NvAwbPeCdbHL1zVKbPCGNIw
+DAYIKoZIzj0EAwIFAANJADBGAiEA0ZHjbT5vz7j4VglXCsJkRHN9pkmBJ6ageFxz
+CwkNYYgCIQDsSd2mcpHxdZ5l3DB11+dMWhAGdKZyLVs2DDunDbiWjg==
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/play-scala-tls-example/scripts/wildcard.example.com.crt b/play-scala-tls-example/scripts/wildcard.example.com.crt
index 3c91b15b3..bf6cd3481 100644
--- a/play-scala-tls-example/scripts/wildcard.example.com.crt
+++ b/play-scala-tls-example/scripts/wildcard.example.com.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICXjCCAgKgAwIBAgIETYGbmzAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
+MIICXjCCAgKgAwIBAgIED96tOTAMBggqhkjOPQQDAgUAMH4xCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgw
 FgYDVQQKEw9FeGFtcGxlIENvbXBhbnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRIw
-EAYDVQQDEwlleGFtcGxlQ0EwHhcNMTkxMjIwMDkwNjUxWhcNMjAwMzE5MDkwNjUx
+EAYDVQQDEwlleGFtcGxlQ0EwHhcNMjAwNDA4MTkxMzU2WhcNMzAwNDA2MTkxMzU2
 WjCBgjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
 DVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD0V4YW1wbGUgQ29tcGFueTEUMBIGA1UE
 CxMLRXhhbXBsZSBPcmcxFjAUBgNVBAMMDSouZXhhbXBsZS5jb20wWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAAQlTZPYo5ai+7oOU0ZpBCk8nP9C4o8Esqrd0mQRhtVB
-Fd8Or2cDa3tQp4p1/ZBRVUXkA49QkJfLOzVelR3Z5PJ6o2cwZTAfBgNVHSMEGDAW
-gBRYR+fT7cz8lcD84CSk6ZqaXc1qZjATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0OBBYEFPkGIg3601DDglWo9qQxBpyGN3oaMAwGCCqG
-SM49BAMCBQADSAAwRQIhAPangYBPRV8Scurs3MHycf8ptxRSwywyL6c8vsfNRm73
-AiBY2rU1M5eV5RNdYzHePnXeIHIWl2qrZ6lbhbfTgdz11g==
+PQIBBggqhkjOPQMBBwNCAAQwenHFzdsNoufEcdwbOl5gIj7ptYFmFIpZ1Mqq0El2
+eckars70lXxHftBW+ZdIq8de2WsCytYs1nu0Pez8zfG7o2cwZTAfBgNVHSMEGDAW
+gBR5s5XvcpoH+tbrqa33dP15K3pL0DATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0OBBYEFMhveL7bS/vfm9qXBQDMRyCuARN8MAwGCCqG
+SM49BAMCBQADSAAwRQIhAMSuz+Mda92pRn5MaenRCPAHnPhuEq6R1RbEgBGeUz9k
+AiBgk86S4cWW8b/ShKHCRTEhQrIILJz84SnE1hnkmO0Zzg==
 -----END CERTIFICATE-----
diff --git a/play-scala-tls-example/scripts/wildcard.example.com.csr b/play-scala-tls-example/scripts/wildcard.example.com.csr
index 5ceb4771d..d42e417f8 100644
--- a/play-scala-tls-example/scripts/wildcard.example.com.csr
+++ b/play-scala-tls-example/scripts/wildcard.example.com.csr
@@ -1,10 +1,10 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBcDCCARUCAQAwgYIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MIIBcTCCARUCAQAwgYIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
 MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9FeGFtcGxlIENvbXBh
 bnkxFDASBgNVBAsTC0V4YW1wbGUgT3JnMRYwFAYDVQQDDA0qLmV4YW1wbGUuY29t
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJU2T2KOWovu6DlNGaQQpPJz/QuKP
-BLKq3dJkEYbVQRXfDq9nA2t7UKeKdf2QUVVF5AOPUJCXyzs1XpUd2eTyeqAwMC4G
-CSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFPkGIg3601DDglWo9qQxBpyGN3oaMAwG
-CCqGSM49BAMCBQADRwAwRAIgDgVDjSnDj4Nig5ocuPyIhPOejOJsBimtTi7jGkpq
-orwCIEiGN3+hthokaa7uGm2pTkgQplksKRfxKfgh02j/i98g
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEMHpxxc3bDaLnxHHcGzpeYCI+6bWB
+ZhSKWdTKqtBJdnnJGq7O9JV8R37QVvmXSKvHXtlrAsrWLNZ7tD3s/M3xu6AwMC4G
+CSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFMhveL7bS/vfm9qXBQDMRyCuARN8MAwG
+CCqGSM49BAMCBQADSAAwRQIgWINBxNaoJKqCCjOJksfGqQrVT/2SO8DhaDv8ed7+
+uG4CIQCcqOhaXxFJ1N2BT2qQJdZY56LUCFldqRxW+0HaOlN1Yw==
 -----END NEW CERTIFICATE REQUEST-----