diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
index ede316b7..01d26e9a 100644
--- a/spec/mysql2/client_spec.rb
+++ b/spec/mysql2/client_spec.rb
@@ -153,7 +153,7 @@ def connect(*args)
 
     let(:option_overrides) do
       {
-        'host'     => 'mysql2gem.example.com', # must match the certificates
+        'host'     => 'localhost', # must match the certificates
         :sslkey    => '/etc/mysql/client-key.pem',
         :sslcert   => '/etc/mysql/client-cert.pem',
         :sslca     => '/etc/mysql/ca-cert.pem',
diff --git a/spec/ssl/ca-cert.pem b/spec/ssl/ca-cert.pem
index cf9b8d51..370470ac 100644
--- a/spec/ssl/ca-cert.pem
+++ b/spec/ssl/ca-cert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICqjCCAZICCQDbDS+Z2mpWkDANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxj
-YV9teXNxbDJnZW0wHhcNMTUwOTA5MDQ1NzIxWhcNMjUwNzE4MDQ1NzIxWjAXMRUw
-EwYDVQQDDAxjYV9teXNxbDJnZW0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDFnpc22lPFtdPELsIffsDt8cD2Hkt47nGMcKQ9n4U98yAg+fodipyP1Bn0
-2OeaONqpttJIET7HxlGrtugPtV/O8XZHlhfAHrRUDMFZJhgnnqK+c/7fRGeB0Eqw
-ljBlRD/dDL3bFq5hVBC9QsGi5k03r+xLPKm5ccAr4WtofcoKXqEbSO6koTSrsGG5
-7inlldM2AVzrY2kXbe0jAyNvYmDL2ycN8G2wObogPWDfITQRhOxfkzKIQiEhQF2Y
-/DlhT7IbIarBIm6abf6JxZ6/Sm5XyVNEWOnryXM6rKyVeGktCxLHNmxx5eKYs440
-8hNgURa8pB+aZaiokkwhM1+jmE83AgMBAAEwDQYJKoZIhvcNAQELBQADggEBACrQ
-umqygXkkbff5Jqf6AYi30U3c+byX+IButRKXN9Ete2LPcT76o/snS9Lexf3KQsIy
-a2Tcc9adak7pBf7FgHdiZkWiQp3MDgx2gJu6Uu6TNzfT8jy2JrHyBWw4ydEvhyA8
-cgelTHSaudafKeQgU4KYc8bqafYFILkWxPzgtwitENIDfx/SHt65BWaQZjYJlFou
-zPZXeoT3lAwKGYqIvwPvBTC23cXg/Swt/mcKe3/Xxjx85Dw/9vi6a9+VQwlOojgd
-w2o07xkIcJcI0Oxyp3mD0U5wAmBQGI76Yi9ZDROHF65KEXfQ3tYKl2vR7CXpcJ4+
-7+fVsE8+dADJdZIiuaA=
+MIICtTCCAZ0CFEzEA8nxZuHFOTFS+J90tKVdtZ6zMA0GCSqGSIb3DQEBCwUAMBcx
+FTATBgNVBAMMDGNhX215c3FsMmdlbTAeFw0yMjEyMjMxNDAxNTZaFw0zMjEwMzEx
+NDAxNTZaMBcxFTATBgNVBAMMDGNhX215c3FsMmdlbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJfJ05rNHBxdsduCjlISNuHT3sxq5v3XcSzlww9Cxhb7
+V3nGMj5HR6xoZjWnALY/wm90IiTqzdJYjvKMdjlYQYYLO2QsIveFqFu7v7lH1dsB
+R7tPfmhvpUL+Uu2ueY0h3vWRG8aIeKS6xJqkAfHHmsz7vL8yi7sYYbN0mqq34nLD
+96BMo5BQtqtHk0X6+K/x3QVkev/fP3Kb1Y7vNXYHUrebV7EGYJObKE3bDPwniqVh
+E3Us2DG05lrUd5iQvqChG6xy0A/tQLEgdDB4117W6ERlwIdgAaKnE5Absm160LIB
+nbvq8GHSXNvXhYSXWhAgNTMUCBurTq3X7uypq2kAK7ECAwEAATANBgkqhkiG9w0B
+AQsFAAOCAQEAGF3BnhEkLAxs46/2sj4OGsFWMMeSF7XOhL3DlrFhet4TNgyICcNO
+lRooV89BsKpxAEIlvA4zO/PoMiJXc7KSML5qJ1IufXUHfQ8ZSpT8+zVMRXlwkw4Z
+9uW4Sft0Edc0IMXhj5DVsPEesKpFa+y5urs/L1f/4IX7LQPmBBXODECMJ/nfRlpg
+T8I130QXl2vFn9zZ66ZWJZX9C3dSkSeApCJHf2elBRtJt9n38xYDpHQ+lv5dYq3x
+nXyI9grznL4YAKuVrBZ6WYbKx7DkZ9+7TSnwpiTfeaKKPGgV3Ooe6rOgmU5cDdaX
+ViZTSXlC5G8/B/mTpcNyBxfPR4sWCK4Z+g==
 -----END CERTIFICATE-----
diff --git a/spec/ssl/ca-key.pem b/spec/ssl/ca-key.pem
index bbdadb7c..193e5bdf 100644
--- a/spec/ssl/ca-key.pem
+++ b/spec/ssl/ca-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAxZ6XNtpTxbXTxC7CH37A7fHA9h5LeO5xjHCkPZ+FPfMgIPn6
-HYqcj9QZ9NjnmjjaqbbSSBE+x8ZRq7boD7VfzvF2R5YXwB60VAzBWSYYJ56ivnP+
-30RngdBKsJYwZUQ/3Qy92xauYVQQvULBouZNN6/sSzypuXHAK+FraH3KCl6hG0ju
-pKE0q7Bhue4p5ZXTNgFc62NpF23tIwMjb2Jgy9snDfBtsDm6ID1g3yE0EYTsX5My
-iEIhIUBdmPw5YU+yGyGqwSJumm3+icWev0puV8lTRFjp68lzOqyslXhpLQsSxzZs
-ceXimLOONPITYFEWvKQfmmWoqJJMITNfo5hPNwIDAQABAoIBAQClkmtFRQVdKCum
-Ojrg4nVIpv2x983qI3U1YobpLocXUWVA29BIAgOMqfuZXkYlu67Q9OEYCoLcJHf2
-88dYqfD81OfxsHpzuAYESa+RPs6MG2hlQ5BuhcRnShnZ++vOXLFZRjynnEg8OY/Q
-0makUmqt1pKWstvNCNYmrbYtFP87UXQCF06zkhM0cZJvVt0gPZGUituWI0uAoE51
-U8+WSwD/T761BHM6BuMn56mfZkP5jeVIFl0iFha9rGR0Z6K8mVQAYQAUtUx9tN/3
-a8fEOcYulq/9R5tMRWtsF8LD8DGQBNkY3e/WKDuZtLw2Dl3L09gxVH9DXCLiYU5d
-OG3JmqDpAoGBAP08yq143H4n6yGT9DC8YjaLgN0VoenK21CEqhwtGWipc/kbGooe
-/jaHl6bo9v1GOGlJieqSUqsXNltS7FOLhGFAQFwMYZ3V/h15Vx23Z+xkCCHIB6HH
-YJZqkQY7Jt86wXcaLU5j9fxM+BY+8Ets4bVhZN9Ai6AnlTz0+d8UJG+bAoGBAMfG
-efYrdjTKI5eK9aiVJyoh57BEPOsTsave2U+R8Q+fErQ0QD0UmbWgwYGgkPuDrFYT
-owg09EEz88KONv18VZ+mB1qfyQUoOL6rWIGxXC08upy2i9100PaBFiYlkLNoK7yJ
-bze0rFSiFclJJXZGzEaVvcEdKnXxfhttaJwQGK6VAoGBAOQEUvJzuwWU5/CqCdvA
-JCa84eEv00RxtZwAeDM6oIBO4+/O6cyoL3nmCTTu20YebjjPUHF4IxuOoREFz2lC
-XIY8ljbLpzG5N0BOu5Q0SkzdnTzdoZGXtm55se+MX2nsu7qERXsqIpl0rIVLUo53
-kZwCABPNSGuCeKwUYNDukAg1AoGBALiHHSqEVKhIOn4FDgqM0uM49CA9t6NPyqI9
-sq6r2GWcgpNPXDLPL3e0KGlK3gBkTLApbULsXt1HVpZT9HlJ+nD/0/UieHS6BUgh
-Txxkrgbe/GQ6vZBuEYJQFBxiQHlm9Fcu/zsOOMvn94W4edD5bkCYmfChtxHAYcKF
-2cWlnJbNAoGAWMV4GIY2DYlztXdyMVuPwsjPcSPMmL8Nc2ATWYRfcoG0Zl0yvwPh
-2VOu7Q/7bNF2LOe6lPe1hoeB6rT44IYZaWMo3ikY8xW9RztOLSv8E9uE1K9yq8OA
-P8QzXmr1Lga+hoEmMHc2biEJNeF6iAcAFfrHj9Sr7w5PC8g4A3PlCvU=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXydOazRwcXbHb
+go5SEjbh097Maub913Es5cMPQsYW+1d5xjI+R0esaGY1pwC2P8JvdCIk6s3SWI7y
+jHY5WEGGCztkLCL3hahbu7+5R9XbAUe7T35ob6VC/lLtrnmNId71kRvGiHikusSa
+pAHxx5rM+7y/Mou7GGGzdJqqt+Jyw/egTKOQULarR5NF+viv8d0FZHr/3z9ym9WO
+7zV2B1K3m1exBmCTmyhN2wz8J4qlYRN1LNgxtOZa1HeYkL6goRusctAP7UCxIHQw
+eNde1uhEZcCHYAGipxOQG7JtetCyAZ276vBh0lzb14WEl1oQIDUzFAgbq06t1+7s
+qatpACuxAgMBAAECggEAAwM7urES+4Ilj06IThsz8SgAHk0J4CRoR+SYikNARMEA
+07cqFJ/cDZE15B84LaXW0Vj7+4EYjDH7Rleg2hMFG+i5qUuR9xk1RfrUO5RwK2xb
+VN2nS+HZZRrAoRyLJ5CySOv0Iezf/h8B23LhYf/c8/AUJzRU3yYE/GeWUUicizwO
+JTuLwtmovO0VYqU50G73fE2qxC/MADFkg4cJEBsqyHR2hZSRh2teXLMiyqfhxoez
+TZfkAgYvyOSAoO/8tSWhrf95O0ngiouhzJOeL/ZCFwcRPki0At7AP/nHEzhrUci1
+6qbEroE9JlNClPmeROIhLzUMQbj9SmwsZI8zzoOCVQKBgQC5GSoeNTS7g0FJ1H73
+jJzK3QmjYh68Bda0I1w2mgmjbBiqVP+dhHLbVAPNw69FRadDjlKDdmvZo5yd14qX
+EKNGpkhHq/1karNjFgZOtZwk2WGpQ4SQlQdgqV+3WhK4X2v1u/kpxPO77ugDpytM
++8G3soIjeBEVlbQBBWh3nNPIrQKBgQDR7kZK01OP+g4yRescgywmhgGTTYooNKau
+y1yPVsE8oR+WkfvRR/UGjcrys+Jp/3EGgf/BCvR1jOWUfSayri8qwiNnB12qGpoR
+gUv012Rg285bllS3cokXYI3RpdWDZWxWAa3ozcreOBXarZtvI718mXhECdiCt+hV
+FYkQbX67lQKBgACvsjNIeTiUxQI0EoByegZaiXWcoIaL8v7Z/raJHa4IcZL4G7aG
+zjI3/oedySGVn4gll/K61q2I6MTBDtd+jUxuw2fYoGjl6GJeq4lRLRIJ6E3LXUt3
+8f4OwrcYU2dxmyHfH45jF5BD04Jn9UYkzNQUilz9TfrpgjBax8dhwntFAoGALmsM
+OeFOWciFuRICsZRDf+UjlgmQIeG6dW3b8onRQnGyBV4UGytY/3D8zft+dceYm0LF
+ZU7hzNgxr0qY8utW3JJ+t3pGeKVXKcW4INQ7irsvfsrXwpRdwcCEuzV654nWkZHf
+fVl7oPUvx+GZO9LgRBu/HvQ6XnUBt0aCvxIm8p0CgYAYl7paGCFPSpJ2k6slhyV5
+bOK7oRMhGlt6SK7/Xfb7Inp+lrnHEHs0BySYpNJu6oRPYkxBfTAZ8sny9Hx5vKjJ
+agI+OhMq9+cWhPPB16hlTAXevDHezr1QWZWkguYvA1oIoLxfgcWSIFSFRqnlluJz
+ymdCeG/Jsqfo6FAkLsLqLQ==
+-----END PRIVATE KEY-----
diff --git a/spec/ssl/cert.cnf b/spec/ssl/cert.cnf
index ca1dce70..3fc82501 100644
--- a/spec/ssl/cert.cnf
+++ b/spec/ssl/cert.cnf
@@ -18,5 +18,5 @@ organizationalUnitName_default = Mysql2Gem
 emailAddress_default           = mysql2gem@example.com
 
 
-commonName_default             = mysql2gem.example.com
+commonName_default             = localhost
 
diff --git a/spec/ssl/client-cert.pem b/spec/ssl/client-cert.pem
index 3887246f..90027bc3 100644
--- a/spec/ssl/client-cert.pem
+++ b/spec/ssl/client-cert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICqzCCAZMCAQEwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMY2FfbXlzcWwy
-Z2VtMB4XDTE1MDkwOTA0NTcyMVoXDTI1MDcxODA0NTcyMVowIDEeMBwGA1UEAwwV
-bXlzcWwyZ2VtLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA1ZuBf1FVJqil7/LvnXqPd43ujo0xqbFy7QrqmM5U/UM3ggMCf2Gr2/Wo
-ZJGPTk1NFaiUyM5mhSlgi0/SGPEp9JMUuH+Uiv9UwmOFl9Em3FXQQ8SG7fV7651u
-AUskNgfEqoy+f+uvi1P155rHNDx7Yw6i+wwfpLGTU0boMnLL6cO/KcIbZlx4/2Lq
-r5sYbpIqhz46bbG+fIhvepruH9h7WVWqAibTqymYrA3T03O/HWTOqfq03gM7Oe3t
-JvJbqX2LecQvi2SbQoX8c2MrQ6X7xDe2Ajh7Yx9DQ1gqClTglbPFHNiWPcGACg+W
-2ptCY/Q2SdP5h1dtj5Sw5VwL3dvCjQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA2
-qTbfgDm0IG8x1qP61ztT9F2WRwG7cp6qHT5oB5wDcOUFes9QJjeB8RoIkB+hRlqG
-J6/Tbxs49d7oKhOQ0UaTnfIKC5m0UFYFGc3lUcwxQyggOWx9XV5ZmGb48+RLFnDV
-Gfcs/hvfem6Xfpgzr8bGs2ZM9x1j9YnXNJVePmKwktjCPnXPOeHyxNZPA+CWHed/
-dNg1IWuQnnp20LgNRARCTgR/ONAJNUfh2GqRLq2JOf0cyhNlsKQ3epkeUyc72knI
-oWVxPluQYvFHN+xif0FMGVLM8lz0b+6uPJDA2Km70B/iorMRVb0vbMeFrMmQ5UgM
-4tplX52P2vb6JNnektfR
+MIICnzCCAYcCAQEwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMY2FfbXlzcWwy
+Z2VtMB4XDTIyMTIyMzE0MDE1NloXDTMyMTAzMTE0MDE1NlowFDESMBAGA1UEAwwJ
+bG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh8af1Q3+
+kTAdQuCVxu7cT7+Rh5dfLzWY1rQkJBARnlvMGDa4DUTEzoD/0c5r04R9bvbhc90K
+zITTmMCHf4xZMMp6MUCF+eHc83/Hl3X+KG3HwgEuS7JLMpoAAnVa5URvk+Dxq/RU
+B0Q0FKsS7RueMSFSKnDcQUf6w9Fut18qijdfh9wi4nqUauxSOvwS1ZSihh/qJPFz
+CwRr6urbBXA4K99pVLf/VPEMVIFX+eZRevznaJm7vPpgd+q6+O3tCYrtMPvzvAvH
+1pfxUJ0d2ROeTjslwN0jByNOluTq1NKAQTz3nQkKnydNyGTicryq42nC04Plk9E8
+KQlWEKLYBso2JwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBqSlGZw6ibcMqJ5ByT
+yMdglgFX80fr6+03odeGjXXy1uG59IQ6Ul4Lo47kw+6gVwGOU5B42/5iY41UN6j1
+Exc8iOGXZTaFaGIhZkGerhdMoL2Ye7NblzKmGnhwTEXP67BDsNZxif8G5HRlRdtP
+DfQdvos1/tT7+LQ4rJXOffvTZkt9iuN6003+zf7qVnYjyOH+9rEZuV7VdSq9L2vg
+04Bod6R4nvzsNTJ1QZmUVShQ+pAAgQOyFi3lTNwHVpgyO9r6wu92qK0B3U8HJ0GQ
+KIqKGnX/DLK/ckH0s0LMIYDSme2X7UcLND+kATZsEhNXywWfbkgNyVqMVqGftULa
+JxJb
 -----END CERTIFICATE-----
diff --git a/spec/ssl/client-key.pem b/spec/ssl/client-key.pem
index d7529422..5a78ff68 100644
--- a/spec/ssl/client-key.pem
+++ b/spec/ssl/client-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA1ZuBf1FVJqil7/LvnXqPd43ujo0xqbFy7QrqmM5U/UM3ggMC
-f2Gr2/WoZJGPTk1NFaiUyM5mhSlgi0/SGPEp9JMUuH+Uiv9UwmOFl9Em3FXQQ8SG
-7fV7651uAUskNgfEqoy+f+uvi1P155rHNDx7Yw6i+wwfpLGTU0boMnLL6cO/KcIb
-Zlx4/2Lqr5sYbpIqhz46bbG+fIhvepruH9h7WVWqAibTqymYrA3T03O/HWTOqfq0
-3gM7Oe3tJvJbqX2LecQvi2SbQoX8c2MrQ6X7xDe2Ajh7Yx9DQ1gqClTglbPFHNiW
-PcGACg+W2ptCY/Q2SdP5h1dtj5Sw5VwL3dvCjQIDAQABAoIBAEWhGjZZWctvQCAW
-bbtEv012a6P2LJEnMdJJM6253IRuC8MKnh7NxMq/qjOWK0OX+R+tQ0qt1Udk9H6U
-92SAAHAkHaYCmHYywvtWm66gU+2Q34Gnp2AcHFfyinBLgTNHlvkNRe/G8QMWzFrB
-3luNt57Tn5b8Hbh+1gpYW8pOF2BMgIsLRK+8b26TKUWrSCc/ZxOSY4wmrNybxkgr
-HGt27lwIN0cvJZbmQvHevNzzCn+bYoo2K1MQj34xHbZ2NLqKqFVlSJtr9+BHffAc
-fkcf+V+D+FkitUVkha9qXa02wtLzYSF+Q5Ef3kQQs6hs/HOdN16g17l9QC6Mk1vm
-a9yV5CECgYEA/9FglQmFimwBCOWEvjkZzoXFusuvRWRgAPU/1c9DAYRS2GfOkjlH
-RPAltczdXh4EQ0NkCqHH7JWgrdXGonKg4fcITumdwcYKV5QfmKBO4onAboEM0Wq7
-wjifuga7npQhPnGvkXFDamVz5McQPObvV42VAUwk1N00gOYw/46ryLkCgYEA1cJv
-jHAq0DKlUGXKyZ+ixsogRpwTQvND/qUquSLgD/KgfeT+70AnsEF6DbVLKoaJ35CF
-ju83VYLfeBljq+E/lgmAyaChplORRXcu+xPQE4rbp0MbsoBOYGNWLFAw3twGsQf9
-iuAtCVxij/hhj4FWRebYHMnV6Min2VPbZdASNnUCgYBIiX8gY3XJPTzB4ArWwWwu
-4kGh6NWHEKIkQ2ZZYw615GZ1VGH/llw+EPYwaamvYUWGKRq55QvCat8Hy6EqOOSj
-jh99+MIxyszt7mNTLMmRdMvqyY7v5prcxJ+N6RDUM16FzUiiLgKWrbPCACv7iOP+
-6HeCyat77ElR73OfUz4kiQKBgH+2r9cEnU/PMp4ac1KLokGLOkV1srxpg9J89E2w
-3JYqrGELlJV1i0DvnfDaxJIf1/hO7L09h537l3C2Gqry5X7LJrtQ0cQCYeVTFCrG
-56cFa78/hSjdJ/bG4xGOx+QfKZBT6dQzpDTXkbva9s86w0T4a16n6LowSLi8NXVb
-H8aRAoGBAKzlt6deB+ASIrGH6mM0eLxF1OcNTB+rE4AJxoUyO1oAmCv9UeK3IzwP
-ohhmo/kEOSCVG6WE+6+r9mojcoHu3ZrobVKl59R7KMdzunMXqxZcXeTqjvqdTtV7
-rWuEz/TKIe7o0Tx19XVGuNftyx2pLuspSAAbZ+YAQJtzmLzsGkss
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCHxp/VDf6RMB1C
+4JXG7txPv5GHl18vNZjWtCQkEBGeW8wYNrgNRMTOgP/RzmvThH1u9uFz3QrMhNOY
+wId/jFkwynoxQIX54dzzf8eXdf4obcfCAS5LsksymgACdVrlRG+T4PGr9FQHRDQU
+qxLtG54xIVIqcNxBR/rD0W63XyqKN1+H3CLiepRq7FI6/BLVlKKGH+ok8XMLBGvq
+6tsFcDgr32lUt/9U8QxUgVf55lF6/Odombu8+mB36rr47e0Jiu0w+/O8C8fWl/FQ
+nR3ZE55OOyXA3SMHI06W5OrU0oBBPPedCQqfJ03IZOJyvKrjacLTg+WT0TwpCVYQ
+otgGyjYnAgMBAAECggEAA/Wy8Pxs0MlC2TSwv2BeEX9W5+EcxpaOngy+FOgTPxpj
+/YicF/3hTjkEFDpOy15eUCDt7AvlrsYXSMyVu2uZenyplwAKDg5cTYHdXs3EpAY0
+VRGIM8wixKj7Y+hrRnFF0t3XoWia5022Ojfm2kQ7y4XVTMKROppZB6hUHrKtOuJj
+wKVVQR7NzwuOsl5IaEXP8eDjUpxjDl8HWOaUFWXziFR9rm2tJQLEOIB9d4rjR/CY
+pyzvkO+PQIi9aLx2Ix5A1x8UxRN/SU7wGmQlB9RLnEZ27XRY2EZidcdWN2poHbgd
+ZY3mHJSaPZcnoGI4MoedKT5DPi4JTX9MiwhLu45tiQKBgQC7y5PB2jGJWBkyFCtZ
+QzVrcFu7BgxdB8SyCFzSJZ0i66cpxdmNV5ZWHPkRIbGic1nLbBMCKEalJZ0FgYfN
+LbqGA3KjImdV8/fwbBwllcd6AkFzUiwittOEtkw4IzGPsJN4AGvzUWv+WZYpd6gV
++cx9RbZn6dVP4QU5pCcI3K6kDwKBgQC5FoDnCEopKb1318gqIkpXG3/ZJniK6CbF
+o3Fnfj7NttA+Pd35CTUqamgwumMly8CeRcwY6Gc3GVgShtmEhXmBrZSUjZnNjlXO
+m/X+hNXNduSM0xveaStTYV6WYXMfSv0uwcdVJ+CeNKrrbZH0uxPa7VwvuzyqonES
+MaUmEWxUaQKBgDPZGuxUf4S57ArlgqpcYe1N0iWqn9M3h9jXcjka5W10vmxMEapy
+WjFgQmu2b8K4Mjx1lDHuSMLjxZx1jLbbPzoszYO4xer3NqcMUiEWX0KSSNu7/i9/
+Zpqnche1r8NKLwzcoPFGs5g/x7OfM6sNkqWrj5bU+m3ZZIXrilNqClWFAoGBAJF0
+zfjC2wVeeDgmrHfwWtv6EI9nXHRN3aqUuBrNbC3e7ej8VeXRBqc+2ILy99hMOCQq
+Vit8+SCkGkL1Fxy+iK8Q6yOT5LtWkLi+eKR9YEkIlrTVc6FmpVXxv5QPIZoGJNMK
+Fs0lebDbUzeR9JKQMxpqT3hzfUncP2A9A7zXFHuBAoGBALD42/GZxhGUG+42P42D
+TTMXgjdMA9R1PzuseL4Cs/4UTzMRguUenmR9WOl/VytistwAYwe+8LM8EzA/eWr+
+N3xyCd3tUxeJy+JqlbvcO+U8X0sxYX7eO814/rHNX72kpd+TTtOYb2UB5vRCbw2b
+xuHccic1Ai/fz2ll/ebnW6O6
+-----END PRIVATE KEY-----
diff --git a/spec/ssl/client-req.pem b/spec/ssl/client-req.pem
index fc077486..0f1f10ed 100644
--- a/spec/ssl/client-req.pem
+++ b/spec/ssl/client-req.pem
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICZTCCAU0CAQAwIDEeMBwGA1UEAwwVbXlzcWwyZ2VtLmV4YW1wbGUuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZuBf1FVJqil7/LvnXqPd43u
-jo0xqbFy7QrqmM5U/UM3ggMCf2Gr2/WoZJGPTk1NFaiUyM5mhSlgi0/SGPEp9JMU
-uH+Uiv9UwmOFl9Em3FXQQ8SG7fV7651uAUskNgfEqoy+f+uvi1P155rHNDx7Yw6i
-+wwfpLGTU0boMnLL6cO/KcIbZlx4/2Lqr5sYbpIqhz46bbG+fIhvepruH9h7WVWq
-AibTqymYrA3T03O/HWTOqfq03gM7Oe3tJvJbqX2LecQvi2SbQoX8c2MrQ6X7xDe2
-Ajh7Yx9DQ1gqClTglbPFHNiWPcGACg+W2ptCY/Q2SdP5h1dtj5Sw5VwL3dvCjQID
-AQABoAAwDQYJKoZIhvcNAQELBQADggEBAB05YaBSyAKCgHfBWhpZ1+OOVp1anr2v
-TkStnqmNrNM2qBJXjfrythPTX4EJAt7+eNdH/6IVA93qKC/EUQVuMjgfMmMUaM+m
-5pqfAo95w7vUY147U9nbC+EIo2u1KOVTNTgl45H372/1vCwTHZYu2atCk4tN3ueO
-0O2XW89Kq94/7PDAExN2PhZdeATVX9dPNT+7ZUDNe8cuq9v0YCHy+2JN2WkplxcG
-kMyCE3YYLnd96YtWiS9DOUib3+b7FwyGe0dXeLVw1br3NZGCZrybyfmnAQfiouAF
-9nMxKIpWFSx00ubGrUefOQqp6nuk27n+scgr4+d6dBXz9efEEvTbLKA=
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAh8af1Q3+kTAdQuCVxu7cT7+Rh5dfLzWY1rQkJBAR
+nlvMGDa4DUTEzoD/0c5r04R9bvbhc90KzITTmMCHf4xZMMp6MUCF+eHc83/Hl3X+
+KG3HwgEuS7JLMpoAAnVa5URvk+Dxq/RUB0Q0FKsS7RueMSFSKnDcQUf6w9Fut18q
+ijdfh9wi4nqUauxSOvwS1ZSihh/qJPFzCwRr6urbBXA4K99pVLf/VPEMVIFX+eZR
+evznaJm7vPpgd+q6+O3tCYrtMPvzvAvH1pfxUJ0d2ROeTjslwN0jByNOluTq1NKA
+QTz3nQkKnydNyGTicryq42nC04Plk9E8KQlWEKLYBso2JwIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBACVP+aJdePdXfshrJ/U3WO48E9EsDsylMTGPd/4wd02ncpy7
+S+H/xRm1AL1NpPf4kXQkQ73iM2BoTnSTSvNrOQ5aGixnMb4cTIu/n/G45JaCxdV2
+x3Y0nbClVSIRKz/8gwH58StdqxLs13NGfwb7YrZFwncSRIpE92JtIim9JoVJQDxF
+ItzyUJ3KmsNdl5sYmAMnsJyz7YzNkOc2tPGsFrSqLDMj07Uyei0ySlzxJ3brGGEK
+ig8SJSgxcsMbDRZ4fQLEj8SXfJgdZMbksavu1U0/KYK29C13GUP9SYSuJJJu5HpO
+VEcUrLbKTbZGTjeI5XHm4CynX/Xx1RxVGOuvjXs=
 -----END CERTIFICATE REQUEST-----
diff --git a/spec/ssl/gen_certs.sh b/spec/ssl/gen_certs.sh
index 3d48da01..50db3fe5 100644
--- a/spec/ssl/gen_certs.sh
+++ b/spec/ssl/gen_certs.sh
@@ -30,7 +30,7 @@ commonName_default             = ca_mysql2gem
 " >> ca.cnf
 
 echo "
-commonName_default             = mysql2gem.example.com
+commonName_default             = localhost
 " >> cert.cnf
 
 # Generate a set of certificates
diff --git a/spec/ssl/pkcs8-client-key.pem b/spec/ssl/pkcs8-client-key.pem
index a4858b4a..5a78ff68 100644
--- a/spec/ssl/pkcs8-client-key.pem
+++ b/spec/ssl/pkcs8-client-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVm4F/UVUmqKXv
-8u+deo93je6OjTGpsXLtCuqYzlT9QzeCAwJ/Yavb9ahkkY9OTU0VqJTIzmaFKWCL
-T9IY8Sn0kxS4f5SK/1TCY4WX0SbcVdBDxIbt9XvrnW4BSyQ2B8SqjL5/66+LU/Xn
-msc0PHtjDqL7DB+ksZNTRugycsvpw78pwhtmXHj/YuqvmxhukiqHPjptsb58iG96
-mu4f2HtZVaoCJtOrKZisDdPTc78dZM6p+rTeAzs57e0m8lupfYt5xC+LZJtChfxz
-YytDpfvEN7YCOHtjH0NDWCoKVOCVs8Uc2JY9wYAKD5bam0Jj9DZJ0/mHV22PlLDl
-XAvd28KNAgMBAAECggEARaEaNllZy29AIBZtu0S/TXZro/YskScx0kkzrbnchG4L
-wwqeHs3Eyr+qM5YrQ5f5H61DSq3VR2T0fpT3ZIAAcCQdpgKYdjLC+1abrqBT7ZDf
-gaenYBwcV/KKcEuBM0eW+Q1F78bxAxbMWsHeW423ntOflvwduH7WClhbyk4XYEyA
-iwtEr7xvbpMpRatIJz9nE5JjjCas3JvGSCsca3buXAg3Ry8lluZC8d683PMKf5ti
-ijYrUxCPfjEdtnY0uoqoVWVIm2v34Ed98Bx+Rx/5X4P4WSK1RWSFr2pdrTbC0vNh
-IX5DkR/eRBCzqGz8c503XqDXuX1ALoyTW+Zr3JXkIQKBgQD/0WCVCYWKbAEI5YS+
-ORnOhcW6y69FZGAA9T/Vz0MBhFLYZ86SOUdE8CW1zN1eHgRDQ2QKocfslaCt1cai
-cqDh9whO6Z3BxgpXlB+YoE7iicBugQzRarvCOJ+6BruelCE+ca+RcUNqZXPkxxA8
-5u9XjZUBTCTU3TSA5jD/jqvIuQKBgQDVwm+McCrQMqVQZcrJn6LGyiBGnBNC80P+
-pSq5IuAP8qB95P7vQCewQXoNtUsqhonfkIWO7zdVgt94GWOr4T+WCYDJoKGmU5FF
-dy77E9ATitunQxuygE5gY1YsUDDe3AaxB/2K4C0JXGKP+GGPgVZF5tgcydXoyKfZ
-U9tl0BI2dQKBgEiJfyBjdck9PMHgCtbBbC7iQaHo1YcQoiRDZlljDrXkZnVUYf+W
-XD4Q9jBpqa9hRYYpGrnlC8Jq3wfLoSo45KOOH334wjHKzO3uY1MsyZF0y+rJju/m
-mtzEn43pENQzXoXNSKIuApats8IAK/uI4/7od4LJq3vsSVHvc59TPiSJAoGAf7av
-1wSdT88ynhpzUouiQYs6RXWyvGmD0nz0TbDcliqsYQuUlXWLQO+d8NrEkh/X+E7s
-vT2HnfuXcLYaqvLlfssmu1DRxAJh5VMUKsbnpwVrvz+FKN0n9sbjEY7H5B8pkFPp
-1DOkNNeRu9r2zzrDRPhrXqfoujBIuLw1dVsfxpECgYEArOW3p14H4BIisYfqYzR4
-vEXU5w1MH6sTgAnGhTI7WgCYK/1R4rcjPA+iGGaj+QQ5IJUbpYT7r6v2aiNyge7d
-muhtUqXn1Hsox3O6cxerFlxd5OqO+p1O1Xuta4TP9Moh7ujRPHX1dUa41+3LHaku
-6ylIABtn5gBAm3OYvOwaSyw=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCHxp/VDf6RMB1C
+4JXG7txPv5GHl18vNZjWtCQkEBGeW8wYNrgNRMTOgP/RzmvThH1u9uFz3QrMhNOY
+wId/jFkwynoxQIX54dzzf8eXdf4obcfCAS5LsksymgACdVrlRG+T4PGr9FQHRDQU
+qxLtG54xIVIqcNxBR/rD0W63XyqKN1+H3CLiepRq7FI6/BLVlKKGH+ok8XMLBGvq
+6tsFcDgr32lUt/9U8QxUgVf55lF6/Odombu8+mB36rr47e0Jiu0w+/O8C8fWl/FQ
+nR3ZE55OOyXA3SMHI06W5OrU0oBBPPedCQqfJ03IZOJyvKrjacLTg+WT0TwpCVYQ
+otgGyjYnAgMBAAECggEAA/Wy8Pxs0MlC2TSwv2BeEX9W5+EcxpaOngy+FOgTPxpj
+/YicF/3hTjkEFDpOy15eUCDt7AvlrsYXSMyVu2uZenyplwAKDg5cTYHdXs3EpAY0
+VRGIM8wixKj7Y+hrRnFF0t3XoWia5022Ojfm2kQ7y4XVTMKROppZB6hUHrKtOuJj
+wKVVQR7NzwuOsl5IaEXP8eDjUpxjDl8HWOaUFWXziFR9rm2tJQLEOIB9d4rjR/CY
+pyzvkO+PQIi9aLx2Ix5A1x8UxRN/SU7wGmQlB9RLnEZ27XRY2EZidcdWN2poHbgd
+ZY3mHJSaPZcnoGI4MoedKT5DPi4JTX9MiwhLu45tiQKBgQC7y5PB2jGJWBkyFCtZ
+QzVrcFu7BgxdB8SyCFzSJZ0i66cpxdmNV5ZWHPkRIbGic1nLbBMCKEalJZ0FgYfN
+LbqGA3KjImdV8/fwbBwllcd6AkFzUiwittOEtkw4IzGPsJN4AGvzUWv+WZYpd6gV
++cx9RbZn6dVP4QU5pCcI3K6kDwKBgQC5FoDnCEopKb1318gqIkpXG3/ZJniK6CbF
+o3Fnfj7NttA+Pd35CTUqamgwumMly8CeRcwY6Gc3GVgShtmEhXmBrZSUjZnNjlXO
+m/X+hNXNduSM0xveaStTYV6WYXMfSv0uwcdVJ+CeNKrrbZH0uxPa7VwvuzyqonES
+MaUmEWxUaQKBgDPZGuxUf4S57ArlgqpcYe1N0iWqn9M3h9jXcjka5W10vmxMEapy
+WjFgQmu2b8K4Mjx1lDHuSMLjxZx1jLbbPzoszYO4xer3NqcMUiEWX0KSSNu7/i9/
+Zpqnche1r8NKLwzcoPFGs5g/x7OfM6sNkqWrj5bU+m3ZZIXrilNqClWFAoGBAJF0
+zfjC2wVeeDgmrHfwWtv6EI9nXHRN3aqUuBrNbC3e7ej8VeXRBqc+2ILy99hMOCQq
+Vit8+SCkGkL1Fxy+iK8Q6yOT5LtWkLi+eKR9YEkIlrTVc6FmpVXxv5QPIZoGJNMK
+Fs0lebDbUzeR9JKQMxpqT3hzfUncP2A9A7zXFHuBAoGBALD42/GZxhGUG+42P42D
+TTMXgjdMA9R1PzuseL4Cs/4UTzMRguUenmR9WOl/VytistwAYwe+8LM8EzA/eWr+
+N3xyCd3tUxeJy+JqlbvcO+U8X0sxYX7eO814/rHNX72kpd+TTtOYb2UB5vRCbw2b
+xuHccic1Ai/fz2ll/ebnW6O6
 -----END PRIVATE KEY-----
diff --git a/spec/ssl/pkcs8-server-key.pem b/spec/ssl/pkcs8-server-key.pem
index c803fba6..dacbc26d 100644
--- a/spec/ssl/pkcs8-server-key.pem
+++ b/spec/ssl/pkcs8-server-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCtyxWYD01zMQby
-RwzqzrGypf/x/rhNUT70HChE9TpojPmCe9e38eSvz1+0kGWb4VGKB705mPsY8yry
-IO/T2StZI11Ddh7qGbiXJFFeU3s4lrcis3qZTZNvui8hPVmGRjn6TRe6FkX0B/lF
-Ip0TV3X2aSAIU7oZpn6qmn4WZFFKgy/EVuDzeaf/RvTrfhnOhbBwhX+93WXt50fK
-73YFBEUJ4hOO0VoB34O/555OHY4/FRjTWTusL2LgxcTcE/GRGk9BPBN4cfhmlJHB
-hTSiXkGOyLGv8kbrYffockDhkiPJbMSdWIRV+ZpQX3YXf2y3lGOGbWptgMi3ttzh
-6RaKmoZJAgMBAAECggEAFhAyLZvDuVwABcH/Yc/bv1JTq+UqgKZP1627bwWy5JMB
-Gg+e0ztiTO+GtuWeAKwaLevNmgJR3lkAmryTtdFcL3TN4kKcqhuZ05ZIvjDa89Qu
-a7ldVxkCHq0ETrP7KZDAy4X9/SHWv6RDgQNj7ZCs6RtvdZ8rgRYh/oaeezlBGLRZ
-OIeWWHTYk8CMhu+tzR+BHZdXUEHo/sZHwmpdhQQ0HtXs87Eo51waVwHL0BgXT+ak
-v7pbhe6sGgNgoix59Lu9WbazxXIyRYDMkZfg0fCauRMG05Wvaeuonk/zlC88Eg3M
-yQIW8+Boe7M2yI+egRYeM2TCBnr2B7n8fTG/xQEKAQKBgQDe+hgYWboh6ejCarAB
-UOd90D//aLtbyu0HBQ6YNiPPUvVmEMfDVscxw6BXTtRWpHYSxsPV+IpUM73St/cu
-RmrP1DOTT4sJJf9lvNg35+OceGHRe0hVUU9mVqBMbLz5NOPwxWlq4eSgK+cAKq3g
-5lp47IFxX0R+g+dvk7YhSy4+rwKBgQDHiEBLjZahY100PffLygIwvwbTyoK9UMjS
-On1sGqOf9aF79zQIIRhEmPN/je9jqnAcf8+ivS1dLYoUboosm7215349Uw6S9C43
-RIn1iLZRGO7Beq3KOrdp4NFnh3QsgoH4jp1gp4w6QyBC2uYBdQXA9GpUR2+Y45BI
-KVSHQV4IhwKBgQDQLig48+04pK9QdVOGpwa7DKfzytDCzx+mIi6SJlogw4+ij6Ay
-3N51s/QMD+loS3yB41oMeFSOcRCVoHUDm3M2PyU4MFfbXsKpNjuZVsPH3w1VDAlo
-vtWm8tIPCKcW9S6sKWRXCjju4o52NWLKS8fEhuwD8bJ9fKGkJwEw7IRsuQKBgQCU
-D4feSI+I7InB9WXGI/1iHK49RJ2lS6fpUBu3t0DJtuSAb5x9l8lBRdoSQclsxJFy
-pGj4Erbx2JQIu0nu9hZdQA1OBi7fXzBYNJTGzQ60uPKaQaVqVg26FGhvEXVkfedi
-ALnJeiq1JRBwa6yXUjXVy8iHB4dJBTwQQBMIVronSwKBgQDOPYklqdzRv+u4XukW
-WsvK7GLj9huwdH0NI5gouGMb5OTgfVo66+urq4qYcHRN4vcdxbP9KoJPBvKhdx+D
-A36I2ERs//92gIz6lcNsqmdAzHAX1yzp4IyFGsjzaKibnQrft7hb9Kfg9VypBb/G
-31x7mm+gZm4RP3jbcBPDn0xU/w==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfpipS/EC9z4+u
+ZNy4rEQ/oRoxBUZJIKiD3b0y38wVWA6MYaVmkvpdFBxs+y3ZcGse7OEK/wbPDVR+
+L8olJsYK5+8Wxy+r+DXi14nWkUPDm42gm/qwkL5GYUVoPES9Jailq6Y7BQEvSL8g
+nPKwULQMH2HTOIn3O8aBM4dy+5Q7LNJ0p3i+IVRF39CElE2Y7lTxn7JA9ZHIg6z0
+VHSjAu2lv4UF1fYpNKUaYvnIk2mZC+yK9EsXpWtMWR0bq9ROZwqG2GCmUZqBolug
+PXH4YpsKU3jbHYSe6HuZIsO4O1beZWklUQBkpZF0RfxUaobbnE4ccS+5gk6Hv8Jy
+Vgj0I0ezAgMBAAECggEAD7dIWFX7u5O4tba5IbbXmxntXaECy8Uawaxs6Rqt2PYL
+rJcaNLBIVCxcJgBOAac27FruRmpXjb9mr2td721TNpShbTEbiMbM6zFDoOs47AMe
+nI5uTb5Z9Myzi/DO5X3VDcYJfare9HwpUHkSzPeM2dqnAyeAMWXhgyuC7HdGntKB
+b2+LXN6bIHOfV55Xs19B9AYD+N8OWkErFDSpbeKIkL6xfcvemC8Qqh1TM4K3RwvX
+6/XPsKpw2Kb7iMI5BV72iGn1/WgP0npzmR3I03vDF9jDOLRGLCAvjCYdp2H93WuP
+vGgOdkR34DCouxqy/LWA825Pqf6mq1a2B6Vepx5teQKBgQDOeGCdR73GSmh3p2mN
+lXLvx7VdaVCU6B5K23osH3YMEqwn2pfBxq5Ml2Ko/MOKhIqL4iOYdwGybOGozL6X
+Js2HYFIUoRlb8zgqAcOTYULsaSW7Gu2iqA5rYjEwPD8Y2jcEKPMdzlWyJ6lJDjzV
+uvQqkJALr+Evo7qOcpveAwsqaQKBgQDF8m/Q1Nma1igNreZjLA6jJ1ZcvkmTDj8J
+1RacxiLRDmmuDvTHo0cAZMPUZ1gBIrTOFjSlwISNcE7Vb+QkEqEJHg2Sf6Hx1QQI
+aG+D3p/3f7a3XQuFLMiTvitChBMMf5I+p9C/ACSngH5EsYR9Yzi1iMYiYPQ+xkjN
+7Q+6MIVFuwKBgQC2PxtIuSKR/OvpciSBjQE/FZDJO0Sdq6XRfZmBiOOyFGlRZGm/
+6ZfAk3/KmhIgGo4QmzPASIt+6wzk6pTw5pdUf3j0LJ8twqo4qgXv+VIRS166oTJQ
++PaBYtL4OLWZQkR9r4epL5AFCW0rxx17quILED+VkVG7s1HgmtlqRlV8wQKBgEYX
+UGyb0em3xzsAxsF7CjvPZA82+gpuUvgCUh11M0LfXaBaf2ZpdGy5QXZmmYzdYzRO
+PJosj0Md72w4UIpNZmQ6Fgg31XoyOVlY0ZPaMr6KpIJNGhUwBF38SoklBzG3wmsZ
+NRtMy63cG9nrGcTka2IsaiwmNJY90+3G8Xi2UZqdAoGAMPQ0rUb7wZ63hlIs26Lx
+akKKNHE6OfgUM2tszkhtpmLFwmcInTKH3dJUFCuesrrdrVb3BWdoDIksJwkyYcqc
+4Yq25DHNJolXaUV6qcXyQp87j+S/Tp/5u1E61JKpFFwEpM4e5f8/161ExTIP5MYh
+cJwGAcmux9HCiFEy3ZLhb40=
 -----END PRIVATE KEY-----
diff --git a/spec/ssl/server-cert.pem b/spec/ssl/server-cert.pem
index 9ec690dd..c43215ef 100644
--- a/spec/ssl/server-cert.pem
+++ b/spec/ssl/server-cert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICqzCCAZMCAQEwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMY2FfbXlzcWwy
-Z2VtMB4XDTE1MDkwOTA0NTcyMVoXDTI1MDcxODA0NTcyMVowIDEeMBwGA1UEAwwV
-bXlzcWwyZ2VtLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEArcsVmA9NczEG8kcM6s6xsqX/8f64TVE+9BwoRPU6aIz5gnvXt/Hkr89f
-tJBlm+FRige9OZj7GPMq8iDv09krWSNdQ3Ye6hm4lyRRXlN7OJa3IrN6mU2Tb7ov
-IT1ZhkY5+k0XuhZF9Af5RSKdE1d19mkgCFO6GaZ+qpp+FmRRSoMvxFbg83mn/0b0
-634ZzoWwcIV/vd1l7edHyu92BQRFCeITjtFaAd+Dv+eeTh2OPxUY01k7rC9i4MXE
-3BPxkRpPQTwTeHH4ZpSRwYU0ol5Bjsixr/JG62H36HJA4ZIjyWzEnViEVfmaUF92
-F39st5Rjhm1qbYDIt7bc4ekWipqGSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBB
-PtRuVmOHiRPH3PmsZPtkgVagznojO+r0GDTxys5bxof8+HcokL6gbb4bRqzUQTdC
-98RTsuFPnd/I8FbbaL+UyeXeKjjOEBPFyllOdykmpd67mHCA89574y7Ib7lkvtr1
-nQFMbeKmcz4uLm1vAi/aOdAIA2de4yJU2XnOkVLDgYnQxpWR451WKqt/FtiuCzpQ
-E3peEemM2XVxvCMmfBAaroAyLYFrWOhNA7UoWVsubp7Ypf7SYuOh+sU6JLsYSadQ
-XVqgvIKG4deUpdl7oUBRz79spAi1OpHWiNmW3b+8nKJoHTfYkKzCebeLdI++xSjX
-jXNryv5xK88LFIPKL/7e
+MIICnzCCAYcCAQEwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMY2FfbXlzcWwy
+Z2VtMB4XDTIyMTIyMzE0MDE1NloXDTMyMTAzMTE0MDE1NlowFDESMBAGA1UEAwwJ
+bG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6YqUvxA
+vc+PrmTcuKxEP6EaMQVGSSCog929Mt/MFVgOjGGlZpL6XRQcbPst2XBrHuzhCv8G
+zw1Ufi/KJSbGCufvFscvq/g14teJ1pFDw5uNoJv6sJC+RmFFaDxEvSWopaumOwUB
+L0i/IJzysFC0DB9h0ziJ9zvGgTOHcvuUOyzSdKd4viFURd/QhJRNmO5U8Z+yQPWR
+yIOs9FR0owLtpb+FBdX2KTSlGmL5yJNpmQvsivRLF6VrTFkdG6vUTmcKhthgplGa
+gaJboD1x+GKbClN42x2Enuh7mSLDuDtW3mVpJVEAZKWRdEX8VGqG25xOHHEvuYJO
+h7/CclYI9CNHswIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQASMAwnwckpYMHf6AzQ
+/HkvLWvGgIvoovVtpQff/OuWuu/GMbdSXeAaUbD4uEIzMAqziDAtUkcJE1pVt/3b
+JIGgmnsK66VV+LCdvg9Og/Y1J0xVhuBNclu3wFEKqlcsp6cTybmCb9dpnwyZAAN8
+DHoHD9iPh6/N3A9ynSz9fgZADbNM0zyQNcYvtr4MXy9suu12fIYOcpTz6XpU++CK
+QMeGanVVuT7/Bucr7dUb/cb1ZIcprH15aumN/XAuJOQG+DNI0nvEHDQEkr7x3MKs
+EgjXKcU7Wbmgh0E791W2DHmJJAh05nrYV17F8YizHOdtT1zEq6Od/nCPmdSQQaJW
+b2ML
 -----END CERTIFICATE-----
diff --git a/spec/ssl/server-key.pem b/spec/ssl/server-key.pem
index 8bc45372..dacbc26d 100644
--- a/spec/ssl/server-key.pem
+++ b/spec/ssl/server-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEArcsVmA9NczEG8kcM6s6xsqX/8f64TVE+9BwoRPU6aIz5gnvX
-t/Hkr89ftJBlm+FRige9OZj7GPMq8iDv09krWSNdQ3Ye6hm4lyRRXlN7OJa3IrN6
-mU2Tb7ovIT1ZhkY5+k0XuhZF9Af5RSKdE1d19mkgCFO6GaZ+qpp+FmRRSoMvxFbg
-83mn/0b0634ZzoWwcIV/vd1l7edHyu92BQRFCeITjtFaAd+Dv+eeTh2OPxUY01k7
-rC9i4MXE3BPxkRpPQTwTeHH4ZpSRwYU0ol5Bjsixr/JG62H36HJA4ZIjyWzEnViE
-VfmaUF92F39st5Rjhm1qbYDIt7bc4ekWipqGSQIDAQABAoIBABYQMi2bw7lcAAXB
-/2HP279SU6vlKoCmT9etu28FsuSTARoPntM7YkzvhrblngCsGi3rzZoCUd5ZAJq8
-k7XRXC90zeJCnKobmdOWSL4w2vPULmu5XVcZAh6tBE6z+ymQwMuF/f0h1r+kQ4ED
-Y+2QrOkbb3WfK4EWIf6Gnns5QRi0WTiHllh02JPAjIbvrc0fgR2XV1BB6P7GR8Jq
-XYUENB7V7POxKOdcGlcBy9AYF0/mpL+6W4XurBoDYKIsefS7vVm2s8VyMkWAzJGX
-4NHwmrkTBtOVr2nrqJ5P85QvPBINzMkCFvPgaHuzNsiPnoEWHjNkwgZ69ge5/H0x
-v8UBCgECgYEA3voYGFm6IenowmqwAVDnfdA//2i7W8rtBwUOmDYjz1L1ZhDHw1bH
-McOgV07UVqR2EsbD1fiKVDO90rf3LkZqz9Qzk0+LCSX/ZbzYN+fjnHhh0XtIVVFP
-ZlagTGy8+TTj8MVpauHkoCvnACqt4OZaeOyBcV9EfoPnb5O2IUsuPq8CgYEAx4hA
-S42WoWNdND33y8oCML8G08qCvVDI0jp9bBqjn/Whe/c0CCEYRJjzf43vY6pwHH/P
-or0tXS2KFG6KLJu9ted+PVMOkvQuN0SJ9Yi2URjuwXqtyjq3aeDRZ4d0LIKB+I6d
-YKeMOkMgQtrmAXUFwPRqVEdvmOOQSClUh0FeCIcCgYEA0C4oOPPtOKSvUHVThqcG
-uwyn88rQws8fpiIukiZaIMOPoo+gMtzedbP0DA/paEt8geNaDHhUjnEQlaB1A5tz
-Nj8lODBX217CqTY7mVbDx98NVQwJaL7VpvLSDwinFvUurClkVwo47uKOdjViykvH
-xIbsA/GyfXyhpCcBMOyEbLkCgYEAlA+H3kiPiOyJwfVlxiP9YhyuPUSdpUun6VAb
-t7dAybbkgG+cfZfJQUXaEkHJbMSRcqRo+BK28diUCLtJ7vYWXUANTgYu318wWDSU
-xs0OtLjymkGlalYNuhRobxF1ZH3nYgC5yXoqtSUQcGusl1I11cvIhweHSQU8EEAT
-CFa6J0sCgYEAzj2JJanc0b/ruF7pFlrLyuxi4/YbsHR9DSOYKLhjG+Tk4H1aOuvr
-q6uKmHB0TeL3HcWz/SqCTwbyoXcfgwN+iNhEbP//doCM+pXDbKpnQMxwF9cs6eCM
-hRrI82iom50K37e4W/Sn4PVcqQW/xt9ce5pvoGZuET9423ATw59MVP8=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfpipS/EC9z4+u
+ZNy4rEQ/oRoxBUZJIKiD3b0y38wVWA6MYaVmkvpdFBxs+y3ZcGse7OEK/wbPDVR+
+L8olJsYK5+8Wxy+r+DXi14nWkUPDm42gm/qwkL5GYUVoPES9Jailq6Y7BQEvSL8g
+nPKwULQMH2HTOIn3O8aBM4dy+5Q7LNJ0p3i+IVRF39CElE2Y7lTxn7JA9ZHIg6z0
+VHSjAu2lv4UF1fYpNKUaYvnIk2mZC+yK9EsXpWtMWR0bq9ROZwqG2GCmUZqBolug
+PXH4YpsKU3jbHYSe6HuZIsO4O1beZWklUQBkpZF0RfxUaobbnE4ccS+5gk6Hv8Jy
+Vgj0I0ezAgMBAAECggEAD7dIWFX7u5O4tba5IbbXmxntXaECy8Uawaxs6Rqt2PYL
+rJcaNLBIVCxcJgBOAac27FruRmpXjb9mr2td721TNpShbTEbiMbM6zFDoOs47AMe
+nI5uTb5Z9Myzi/DO5X3VDcYJfare9HwpUHkSzPeM2dqnAyeAMWXhgyuC7HdGntKB
+b2+LXN6bIHOfV55Xs19B9AYD+N8OWkErFDSpbeKIkL6xfcvemC8Qqh1TM4K3RwvX
+6/XPsKpw2Kb7iMI5BV72iGn1/WgP0npzmR3I03vDF9jDOLRGLCAvjCYdp2H93WuP
+vGgOdkR34DCouxqy/LWA825Pqf6mq1a2B6Vepx5teQKBgQDOeGCdR73GSmh3p2mN
+lXLvx7VdaVCU6B5K23osH3YMEqwn2pfBxq5Ml2Ko/MOKhIqL4iOYdwGybOGozL6X
+Js2HYFIUoRlb8zgqAcOTYULsaSW7Gu2iqA5rYjEwPD8Y2jcEKPMdzlWyJ6lJDjzV
+uvQqkJALr+Evo7qOcpveAwsqaQKBgQDF8m/Q1Nma1igNreZjLA6jJ1ZcvkmTDj8J
+1RacxiLRDmmuDvTHo0cAZMPUZ1gBIrTOFjSlwISNcE7Vb+QkEqEJHg2Sf6Hx1QQI
+aG+D3p/3f7a3XQuFLMiTvitChBMMf5I+p9C/ACSngH5EsYR9Yzi1iMYiYPQ+xkjN
+7Q+6MIVFuwKBgQC2PxtIuSKR/OvpciSBjQE/FZDJO0Sdq6XRfZmBiOOyFGlRZGm/
+6ZfAk3/KmhIgGo4QmzPASIt+6wzk6pTw5pdUf3j0LJ8twqo4qgXv+VIRS166oTJQ
++PaBYtL4OLWZQkR9r4epL5AFCW0rxx17quILED+VkVG7s1HgmtlqRlV8wQKBgEYX
+UGyb0em3xzsAxsF7CjvPZA82+gpuUvgCUh11M0LfXaBaf2ZpdGy5QXZmmYzdYzRO
+PJosj0Md72w4UIpNZmQ6Fgg31XoyOVlY0ZPaMr6KpIJNGhUwBF38SoklBzG3wmsZ
+NRtMy63cG9nrGcTka2IsaiwmNJY90+3G8Xi2UZqdAoGAMPQ0rUb7wZ63hlIs26Lx
+akKKNHE6OfgUM2tszkhtpmLFwmcInTKH3dJUFCuesrrdrVb3BWdoDIksJwkyYcqc
+4Yq25DHNJolXaUV6qcXyQp87j+S/Tp/5u1E61JKpFFwEpM4e5f8/161ExTIP5MYh
+cJwGAcmux9HCiFEy3ZLhb40=
+-----END PRIVATE KEY-----
diff --git a/spec/ssl/server-req.pem b/spec/ssl/server-req.pem
index 94675507..246b71fb 100644
--- a/spec/ssl/server-req.pem
+++ b/spec/ssl/server-req.pem
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICZTCCAU0CAQAwIDEeMBwGA1UEAwwVbXlzcWwyZ2VtLmV4YW1wbGUuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcsVmA9NczEG8kcM6s6xsqX/
-8f64TVE+9BwoRPU6aIz5gnvXt/Hkr89ftJBlm+FRige9OZj7GPMq8iDv09krWSNd
-Q3Ye6hm4lyRRXlN7OJa3IrN6mU2Tb7ovIT1ZhkY5+k0XuhZF9Af5RSKdE1d19mkg
-CFO6GaZ+qpp+FmRRSoMvxFbg83mn/0b0634ZzoWwcIV/vd1l7edHyu92BQRFCeIT
-jtFaAd+Dv+eeTh2OPxUY01k7rC9i4MXE3BPxkRpPQTwTeHH4ZpSRwYU0ol5Bjsix
-r/JG62H36HJA4ZIjyWzEnViEVfmaUF92F39st5Rjhm1qbYDIt7bc4ekWipqGSQID
-AQABoAAwDQYJKoZIhvcNAQELBQADggEBAInWIFsq14b8PhDroMMvi1ma30xyQGjg
-KObIxakwXkliSxmCdVqV4+MV6w8hK3z0q7H+NzRFByjo1PnU8BCIa058m5uvbjmM
-wGQvpcxmpm1p8VKKoeTqvE8OelbrqHrmyNIq7E/S3UZelVt+HOIPJOOs/aqEzaEg
-VL1u+4kCMbHM2rG8dii060oZ5i/gUtMn2TQWcNjSQBvaVztW5FOL74bYkoq0zIwd
-MFl2BoYyAnERJEcBmh1f+D7MuxPaqTUKjUmfDbHCMAAyTS1FHr9AnIN0/C2Mxywl
-H/zL9/DkfR53KZjITkf2gTH5D/N5oDUwmgCg6UZ0MeTOP27jvgcvb/k=
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAn6YqUvxAvc+PrmTcuKxEP6EaMQVGSSCog929Mt/M
+FVgOjGGlZpL6XRQcbPst2XBrHuzhCv8Gzw1Ufi/KJSbGCufvFscvq/g14teJ1pFD
+w5uNoJv6sJC+RmFFaDxEvSWopaumOwUBL0i/IJzysFC0DB9h0ziJ9zvGgTOHcvuU
+OyzSdKd4viFURd/QhJRNmO5U8Z+yQPWRyIOs9FR0owLtpb+FBdX2KTSlGmL5yJNp
+mQvsivRLF6VrTFkdG6vUTmcKhthgplGagaJboD1x+GKbClN42x2Enuh7mSLDuDtW
+3mVpJVEAZKWRdEX8VGqG25xOHHEvuYJOh7/CclYI9CNHswIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBAJc01lx4kZDJqtKMLGJb9br5ELnjE6F8b2KGNEZa97IOw7xC
+Oy8qBvJm+9lC3OVVKVBQyrZ5TMUqjZNSgvnGirV0/Jt3/9ipgU04+jGm3fUe0gWL
+KzX7yuE1GVOVT/d+Djv5V0qb6ReNfS6vYMwLUu7I0rd9QCYWv69c1BJsNDvQG3VW
+NOM1wSW19NSq1fjToVAkXUPKUvuyzGlA4hs6PhBifnD8IyHnMr4hgWflipMztjAV
+0h5+jbmU1vE13pH3D0KQG/2ZlWA7j4PFVA6AiTubFP0MmfrXzi0TU89Po2U213Qo
+Jw9cFNQoRwmDwBCjl3hbeHZO3oQnnmnhXc0XxLU=
 -----END CERTIFICATE REQUEST-----