Use KeyManagerFactory for client TLS credential setup (#88)

Author: kennethshackleton

pushiko-http/src/main/kotlin/com/bloomberg/pushiko/http/HttpClientBuilder.kt

@@ -35,9 +35,11 @@ import io.netty.handler.ssl.SupportedCipherSuiteFilter
 import org.slf4j.LoggerFactory
 import org.slf4j.event.Level
 import java.net.InetSocketAddress
+import java.security.KeyStore
 import java.security.PrivateKey
 import java.security.cert.X509Certificate
 import javax.annotation.concurrent.NotThreadSafe
+import javax.net.ssl.KeyManagerFactory
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -77,7 +79,7 @@ class HttpClientBuilder internal constructor() {
             .sslProvider(sslProvider)
             .apply {
                 if (clientCertificate != null) {
-                    keyManager(privateKey!!, privateKeyPassword!!.joinToString(""), clientCertificate)
+                    keyManager(keyManagerFactory())
                 }
             }
             .ciphers(Http2SecurityUtil.CIPHERS, SupportedCipherSuiteFilter.INSTANCE)
@@ -117,6 +119,16 @@ class HttpClientBuilder internal constructor() {
         EventLoopGroupType.SECONDARY -> sharedSingleEventLoopGroup
     }
 
+    private fun keyManagerFactory() = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()).apply {
+        init(
+            KeyStore.getInstance("PKCS12").apply {
+                load(null)
+                setKeyEntry("pushiko", privateKey, privateKeyPassword, arrayOf(clientCertificate))
+            },
+            privateKeyPassword!!
+        )
+    }
+
     private companion object {
         private val logger = Logger()
         val sslProvider: SslProvider = if (OpenSsl.isAvailable()) {