diff --git a/spec/fixtures/ssl/cassandra.crt b/spec/fixtures/ssl/cassandra.crt
index 8fe65e2..1598932 100644
Binary files a/spec/fixtures/ssl/cassandra.crt and b/spec/fixtures/ssl/cassandra.crt differ
diff --git a/spec/fixtures/ssl/cassandra.pem b/spec/fixtures/ssl/cassandra.pem
index 4db7e61..e112a9d 100644
--- a/spec/fixtures/ssl/cassandra.pem
+++ b/spec/fixtures/ssl/cassandra.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIEK0fi+jANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoT
-B01hc2hhcGUxHTAbBgNVBAMTFFRoaWJhdWx0IENoYXJib25uaWVyMB4XDTE3MDcx
-OTIxNTkzMVoXDTE4MDcxOTIxNTkzMVowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
-AkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRAwDgYDVQQKEwdNYXNoYXBlMR0w
-GwYDVQQDExRUaGliYXVsdCBDaGFyYm9ubmllcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMJpyccfY5ED19CG8FdnldYKVm/Kx3jLjWViOoja8I/pR75z
-pwt3Eg/w5CLTIOLvaq5/RPg+4JvoHhS19icrz7dxPd7VV9T7OYO/E3W/qaUt/2ZK
-bRIKNZc/7XBdckDqOrK6wkfvB2UpexoeWUak96toG1AruOavIOqZdGlKRtGEYACE
-h5YFHJMGSbQwiC/RlQgF1/iXhYI0aeP8288wevmezF1sP2xkOmPxS9w/L34YZo2e
-+2hUxCZ/A6uqHefTXwk0LPM+qN2lkRTHmkSAI9hufCsGhUphVa65/J2/il3TN14A
-AS8nrrOAAPv0nXlpoFiqh29VH1xK++vPC4eFSeMCAwEAAaMhMB8wHQYDVR0OBBYE
-FAChel5zpbjfPP5SfCC85+MZJLo/MA0GCSqGSIb3DQEBCwUAA4IBAQCnJ++tlauL
-4jXQnWf1mrge8uFtZnFeoUAYlB/q7QWvAr///VIPdYuEpMJC+bQFBu92hXhBOnFY
-hrK9DxlT7hMW+x3SBIGwIUWaLQGxUe195rFiSKL5dee38W2sjW9HrF7Dr2V7UoVe
-R3RzRiuOdeN07PIUBZ+0KZptQL+Y5I7o8yTqdFOMNpz0B2mpNY2jf6Sdffr+fmKg
-gfGmrxOWBPKrZJZi/WI2wV4Ve8bZ6hd61lI+KaiuKdVb0BoIGc/ufDG4T4W3blwe
-fSfr3IEWC1G/LKylQpdueiw1VwiP3/f0Bp0SFndJTDukWGGTuYgurJzorXZuNIA9
-lY7T/QHCntW7
+MIIDZzCCAk+gAwIBAgIESnm9CDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xETAPBgNVBAoT
+CEtvbmcgSW5jMR0wGwYDVQQDExRUaGliYXVsdCBDaGFyYm9ubmllcjAeFw0xODA4
+MDkwMDQ2NTlaFw0yODA4MDYwMDQ2NTlaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+EwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzERMA8GA1UEChMIS29uZyBJbmMx
+HTAbBgNVBAMTFFRoaWJhdWx0IENoYXJib25uaWVyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAz4yWeL91GSVM+XYbAeJIJRKnoI7uJMpqSlhXFNln/qgU
+wNO2BZL5Y+VuyHibeJdInKS38obbPKSzbueDR3fLAWA69fBzIOG6kcALQcVm969n
+UgYgkC2h6M1xfVdf768cH2h+TGAqfQPNPgWm3gwt71tbRh3I49wJ+P71eo1sH60K
+tRl2RG2yVpJsC7v/yWjrco3eObo02AqJmG2vH9T5MxpchjLI5u6U4jz7xlhQvCH0
+3O3Wohf8oOhNbhfx7UUkB6DK8JL0EJ0iJh4Kak0YQn6jH1kmq5AfOkmkIOgwZ7PZ
+dpvVxgTxBZtCdN04S7IWX+KV8hirbbbyrVONW40DgQIDAQABoyEwHzAdBgNVHQ4E
+FgQUS+MZAFVjXTsoMuwMslaR3VqSP4QwDQYJKoZIhvcNAQELBQADggEBAIKRbhom
+FDK+USXTCu+uOC4sl3M9QrHmK9S3Ofmah+Jtptg1zrLQHe9ObTS//OJXESZtnELg
+kOYXjqTnKzN7dy7t9DY55uIedVicstybuwBcb6mm1ZNiuck366EHKFOXwnF/vqfH
+EaUdjsX0gXdMSc8fUuYfemxKfbPCccklepmTK+ytdAa2zxSzN+1ZEoKTzfINmq3Z
+5eH1To1PYGFFf7v4PFwg87WjxmW9VorbpTydR2K7elVuVN5ijCYAFE1Qwh7mXM3z
+lnY1V/eTSAhSIb2q/iTR6ghE0ZtSG1O4m8goohhSr+DpA7YtYOedT/MPtGJ7iiSJ
+fod4ZibuJXMRJhQ=
 -----END CERTIFICATE-----
diff --git a/spec/fixtures/ssl/client.p12 b/spec/fixtures/ssl/client.p12
index 2dce558..a5b9dac 100644
Binary files a/spec/fixtures/ssl/client.p12 and b/spec/fixtures/ssl/client.p12 differ
diff --git a/spec/fixtures/ssl/client_cert.pem b/spec/fixtures/ssl/client_cert.pem
index 2fe07dd..c2f074b 100644
--- a/spec/fixtures/ssl/client_cert.pem
+++ b/spec/fixtures/ssl/client_cert.pem
@@ -1,26 +1,26 @@
 Bag Attributes
     friendlyName: client
-    localKeyID: 54 69 6D 65 20 31 35 30 30 35 30 31 35 37 32 33 39 36 
-subject=/C=US/ST=CA/L=San Francisco/O=Mashape/CN=Thibault Charbonnier
-issuer=/C=US/ST=CA/L=San Francisco/O=Mashape/CN=Thibault Charbonnier
+    localKeyID: 54 69 6D 65 20 31 35 33 33 37 37 35 36 31 39 37 39 37 
+subject=/C=US/ST=CA/L=San Francisco/O=Kong Inc/CN=Thibault Charbonnier
+issuer=/C=US/ST=CA/L=San Francisco/O=Kong Inc/CN=Thibault Charbonnier
 -----BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIEGLFGvjANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoT
-B01hc2hhcGUxHTAbBgNVBAMTFFRoaWJhdWx0IENoYXJib25uaWVyMB4XDTE3MDcx
-OTIxNTkzMloXDTE4MDcxOTIxNTkzMlowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
-AkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRAwDgYDVQQKEwdNYXNoYXBlMR0w
-GwYDVQQDExRUaGliYXVsdCBDaGFyYm9ubmllcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALBA0sXlPKgFK3FMzvdhqKpZ/u0iILMUiwTh7fL9LeyJzhJt
-JK7TwXBNWgXOi5BFIutQI6WKa91+yA+QQnC0eF4X9hldmobjYfgVPKrDvSZySNCa
-81WPtqoWXLmFemZMkosM/mistlblwEpOtXqCZ9X1Uem4ARygf9WtzL4NitPxyC8d
-ZSOGAasrJ4XN/0ObPYkWndfWbUiRPcgwJHGRKa01FM8QNEpEVi+7YcWsUwnZABtu
-8KVruEx5Ky5aF97vUUGnLIUEuMnFFVzn1TP57QsgAarQg+939n70+Nw4gjOq6O1T
-+3bJVP8ulOKEsYLrxuwTkFxJirquf34mtSlb6nMCAwEAAaMhMB8wHQYDVR0OBBYE
-FDmTu94KMShPk3ZJ5N0SkUh1wJ22MA0GCSqGSIb3DQEBCwUAA4IBAQCD4xCE9QF+
-yazRoIhC5+YfHLrEByEegKbbqGXgDkLNTjG0t9aOZGUplNKh24anEEgabGC9+Kjk
-jlApyqa+sEhu8XMZRnbvLWu4QjHoZfHpaxbBuEBPNu9bqVzYu5desUUnd4RuPlL8
-pewdrSOITy2OoEhUtA0fwPa02loQqSXwxrDnKJpvJuS0WdmBGpdcGh87QHzRLFC8
-6o9lIR+4tyKkjtmeYj/HdQW4ZQavq2HKMwOYOiMpyqkKiwE2VVRC5EEzbEPcUbEZ
-5Yr9RagG5hI/QedjSc8Ny4/iK15EA4qonLPKnE9LTpBMgtfmKUPSwcAy5ReslsAl
-fZbipa3gw23M
+MIIDZzCCAk+gAwIBAgIENlh1XjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xETAPBgNVBAoT
+CEtvbmcgSW5jMR0wGwYDVQQDExRUaGliYXVsdCBDaGFyYm9ubmllcjAeFw0xODA4
+MDkwMDQ2NTlaFw0yODA4MDYwMDQ2NTlaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+EwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzERMA8GA1UEChMIS29uZyBJbmMx
+HTAbBgNVBAMTFFRoaWJhdWx0IENoYXJib25uaWVyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAsUGzL/NnTnB1xHXq0lowH+xgaS9WKRMJfWOTQ5hvlWWO
+tzofC95/Ar9qSzOmdCmsIIl+G59lcLq96l3LJIPNzQjDREfSGfF3LWoAUKCWDM4Y
+pIzpiRWFNug6IiXDeWD3dhDwbNpzYm2ySkNKfaJW4gLHVO/MQzwCeHUlIeP+VyV1
+rp2FBsch8jUNC8GGWB/QR70qYaiLi63hIJcQtlPd4TC1VBo+M8RGq28iDcIHbwu8
+4+Yna0istZqSx+qBSe8wHmtVwpXpcQRRbWLeiauv587ielF0AE6XvTCARyFXmYGH
+YZRFG9lN4iAcPBtZGJIKd3C6F/d8MntSGsLRvGAbRwIDAQABoyEwHzAdBgNVHQ4E
+FgQU332pe++A/cyB2kmz+kA9QbSG+6QwDQYJKoZIhvcNAQELBQADggEBAH8ryvgy
+jGaSXki8hEwQGEqLyuW+QNx3eksrV1XIGJPxJokxY55lzi1+N4eh/rKk/tSvzW5p
+phz91+gzEvfNMMDA4RFHivX1u1Rv8UKLRIn4NhUCzUOPePM86u8pDviVWQAK7tEN
+qXPJxU6cpRcC2Ze/NDlmjHQWGNpuTyM/qmhg91NOjNNLjS8q4lrWsP9OdCT3AJwY
+ioQbjuQbWKq2GFrn1BPNX6DTEexb+S4My1sH9FgKbJi+qMaAz0jno2OC3/7Oszg3
+GrD4/Blrp3O8uyNNmSNyRetmzNaLdnlqdRHxuhg1VIzX3z7ZUIZE2m7ZKdJdNVjV
+2ikHNoYEBPhZ7WA=
 -----END CERTIFICATE-----
diff --git a/spec/fixtures/ssl/client_key.pem b/spec/fixtures/ssl/client_key.pem
index e53581f..4b07c35 100644
--- a/spec/fixtures/ssl/client_key.pem
+++ b/spec/fixtures/ssl/client_key.pem
@@ -1,32 +1,32 @@
 Bag Attributes
     friendlyName: client
-    localKeyID: 54 69 6D 65 20 31 35 30 30 35 30 31 35 37 32 33 39 36 
+    localKeyID: 54 69 6D 65 20 31 35 33 33 37 37 35 36 31 39 37 39 37 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwQNLF5TyoBStx
-TM73YaiqWf7tIiCzFIsE4e3y/S3sic4SbSSu08FwTVoFzouQRSLrUCOlimvdfsgP
-kEJwtHheF/YZXZqG42H4FTyqw70mckjQmvNVj7aqFly5hXpmTJKLDP5orLZW5cBK
-TrV6gmfV9VHpuAEcoH/Vrcy+DYrT8cgvHWUjhgGrKyeFzf9Dmz2JFp3X1m1IkT3I
-MCRxkSmtNRTPEDRKRFYvu2HFrFMJ2QAbbvCla7hMeSsuWhfe71FBpyyFBLjJxRVc
-59Uz+e0LIAGq0IPvd/Z+9PjcOIIzqujtU/t2yVT/LpTihLGC68bsE5BcSYq6rn9+
-JrUpW+pzAgMBAAECggEAS3Ezxuk8cV7lHXYXEOSIYYJsD+yPupeMeeaLB3s/cQP7
-ZP+6t+qD3iH96oZiTrqJG9gNqgn56bEeySqihcN50izHdkwOnLYvdRUCBsYJ7K72
-Y/QvO+xr75nqzq5Hmgokn8hMDVoAImntSOEv5OR0taxwB25va2V30mq2PJNnXRhm
-swR4O0D6P1OONWf7VoTcnC+WY8fL6W5urQEDM0W43aZurx4oNg6NJLcQRONSiB9B
-AK28RjNEIB6LbmyjQW8hL38V8ZZPBmA6Jp57LPQt7r8SpgjttCsLAEKzGs1Tqzoi
-kTyrt0rDadrF8l08Rr1/BSKnJo75+2RXTcveEpKwAQKBgQDif739uH3S1hA79fMX
-hGLyiXEEzmvR9dILV0CDLb00ChhrtakERQt8JqItyu23apjPhiCRA/7md26iKaMd
-TRi4pJZpP/ayQB8e69a1C6ph3aLMjOZvP3o/FjXW4cjHjOTQQq+TtKVarAZsKxRI
-BSA0s+MKCqNQ52pSCmbv3FYuAQKBgQDHNbaw5wYWqg0I5u7K/uq7DiMS5EW0USfj
-c9KbkVpwCiGx60E63CqyEhzq3PYZRczwAkfwslSYtakAabg9t6u3i26HCFjQ3wAo
-iQHseTVqzwuFvkdZmKiPoGYt3WAn8DPiBr9yIDAShWcFJtG06HqpvYWmB5BkSzuJ
-wBX0/SVAcwKBgA4Lndx99E9+tsMBHXH346rmmvuRUV5TwBKz9mwsCe+QMLN9MF3z
-aiLowmXUj6kwEwnLZ3mWpdfk0Bd+PX8zqLTKgAlGziV/lG52cXoInygydkX49tEv
-PoVq+yu4FJtLQWUovXqLWTWmNT+/7CILL1QVU57ryfTaZN1xh7CYGUABAoGAN9wW
-+2n8qhRLDWj8Is3ycjtXmG+MIDD1l3Ed6GOM0Yf1xNcr9l5QVph/pVgKZjHNcquh
-Epxe3mdqGWSLtjqvmwstFg5AIWm2uKcac/3U/btLBtjBVx1YftXCcS/3S5uuYL31
-pwHhmP/xUF9/RFRAOSKcvF64nXb/HfRP89+cN4MCgYBe9ex+8MW4bhO3V8Um8Ij2
-6RkvaGmBWR4+VhznC7Z3ZNRkmwTJhnK6qsJGt+O4L3/ApklzhXNzPkobth0DnvyX
-o5AFkqgzMwdKBWxbDRuGIIo9fOD9jCZgBgOmbE9wEWP2xIzTS29h+dJAGX1z6lwx
-Bg+naRCGczLM5yHXeWITQA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxQbMv82dOcHXE
+derSWjAf7GBpL1YpEwl9Y5NDmG+VZY63Oh8L3n8Cv2pLM6Z0KawgiX4bn2Vwur3q
+Xcskg83NCMNER9IZ8XctagBQoJYMzhikjOmJFYU26DoiJcN5YPd2EPBs2nNibbJK
+Q0p9olbiAsdU78xDPAJ4dSUh4/5XJXWunYUGxyHyNQ0LwYZYH9BHvSphqIuLreEg
+lxC2U93hMLVUGj4zxEarbyINwgdvC7zj5idrSKy1mpLH6oFJ7zAea1XClelxBFFt
+Yt6Jq6/nzuJ6UXQATpe9MIBHIVeZgYdhlEUb2U3iIBw8G1kYkgp3cLoX93wye1Ia
+wtG8YBtHAgMBAAECggEBAKDf2Bk0+BWgy8G6o5y2becLSZUteS1eMcazkPxQZTVa
+LuTswzCqhuuffoEyJ2hWSfpdzy6SxCZD1gnXhn9lgGsOAOr/pBgXpup4wkBq/sQw
+aP0vRuU7uuPScLB9RaPr9awaQ5sHyKEUnjP4Tqsno2MM0oyr9t8un69j4oeXvUap
+GeLgc39Mx+5VQPPV1at7tIL7ZurOibSlmRPdqg+7Oj52BomouYbD0YrTBMLf0gy0
+LcxhrzXCh976o5XdV+EYMTzGKjDAiGrzhJZgP8ixT4z1Zbydj+qHotWxbCNzfvYN
+tLsMRmHODjCg08Ay5bk1NnU5GU7AQXic8MeWuchaSYECgYEA90eNEaAIHe4BGR/C
+FkspmZvs/1DQUUhNl2JL8dqI0pRGy+NkftkCNT2YOhb2VRHgniQaLhQRsOHqQVZL
+etqLaRcMlE3ZsEtLO3kuPTR4JwGPnNrNZe/qDeuQnEP9LI9RpS0ZtiZPPnZzf9K5
+caL9bWJ0mQmrxF+vEb+fH1XNQH8CgYEAt4H61autY9OY8barEs3GCyey7XDRHX+8
+61NAJU76nsx7bu75bTPclEaIgb7KOrqFQGvJGcccRl15SQGB59T/XU1Nt2gWSqh6
+UZTgsYvOKqrL8s5c/WYPknkDbMniA616CaBHuySxEki68z58fpAC7zDyAzREauYw
+lFmXlpVzwTkCgYBBOd9tIcBiXLBvdyAUD1l2yll2c1OvzRmib+xGbHWgzjnqeB2/
+E/DwKEIqOHpbsC6GqFE7jFGqTb0j5OZeDp2tZ8YKrIpaZVH/6xQWUuvKpi/CmTiK
+xgEAEP4BKjHy+g74OfBJSsumV0paEjSWU/7zRoApChMD5pVgYiJP+qr8cwKBgBxg
+Nv9PWrJzB9Von696rkMPUnWw2kUreXUSHHsoaUyg5f1TarJeMJ+lAHq/m9nU+cHq
+aOBZj5+52IVXfFTy9MHisD/KEphc0P1Ifi42Jh0m5/6Vtn9ghsvpdoQd+5sB+jr+
+09i2ZcMkB/SRFwMjFbES6nlgXawCCEUITY51cb7RAoGAV4ZVx0DkUDBOc+m9FI1Q
+xe38dv0aup8yCczDDqUCumarLHFhBCr0V//ZcDlN9XBjIP1F5aamg09yEsGGXtp7
+bwM9BweZapBWn/5l1SwreYPyCm8lZnO/iTHL4H8MYZFFIml+fyBwbWLgmZbC+J2N
+eQwxxfAx5tlxlIwrXz5YeeA=
 -----END PRIVATE KEY-----
diff --git a/spec/fixtures/ssl/keystore.jks b/spec/fixtures/ssl/keystore.jks
index c77eb95..7ce79ef 100644
Binary files a/spec/fixtures/ssl/keystore.jks and b/spec/fixtures/ssl/keystore.jks differ
diff --git a/spec/fixtures/ssl/truststore.jks b/spec/fixtures/ssl/truststore.jks
index 7879232..a6ac616 100644
Binary files a/spec/fixtures/ssl/truststore.jks and b/spec/fixtures/ssl/truststore.jks differ