Remove assumption "JKS" is always available. (#3854)

On some platforms (e.g. Android) Java KeyStore (JKS) support is not available. Using the default platform keystore ensures that keys can still be stored on those platforms.
ktorio · Jan 2, 2024 · b323584 · b323584
1 parent 856da89
commit b323584
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...ls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/Certificates.kt b/...ls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/Certificates.kt
@@ -175,7 +175,7 @@ public fun KeyStore.generateCertificate(
  *  If [file] is set, all certificates are stored in a JKS keystore in [file] with [password].
  */
 public fun KeyStore.trustStore(file: File? = null, password: CharArray = "changeit".toCharArray()): KeyStore {
-    val trustStore = KeyStore.getInstance("JKS")!!
+    val trustStore = KeyStore.getInstance(KeyStore.getDefaultType())!!
     trustStore.load(null, null)
     aliases().toList().forEach { alias ->
         val cert: Certificate = getCertificate(alias)

diff --git a/...rk-tls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/builders.kt b/...rk-tls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/builders.kt
@@ -157,7 +157,7 @@ public class KeyStoreBuilder internal constructor() {
     }
 
     internal fun build(): KeyStore {
-        val store = KeyStore.getInstance("JKS")!!
+        val store = KeyStore.getInstance(KeyStore.getDefaultType())!!
         store.load(null, null)
 
         certificates.forEach { (alias, info) ->

diff --git a/ktor-server/ktor-server-core/jvm/src/io/ktor/server/engine/EnvironmentUtilsJvm.kt b/ktor-server/ktor-server-core/jvm/src/io/ktor/server/engine/EnvironmentUtilsJvm.kt
@@ -38,7 +38,7 @@ internal actual fun ApplicationEngine.Configuration.configureSSLConnectors(
     val keyStoreFile = File(sslKeyStorePath).let { file ->
         if (file.exists() || file.isAbsolute) file else File(".", sslKeyStorePath).absoluteFile
     }
-    val keyStore = KeyStore.getInstance("JKS").apply {
+    val keyStore = KeyStore.getInstance(KeyStore.getDefaultType()).apply {
         FileInputStream(keyStoreFile).use {
             load(it, sslKeyStorePassword.toCharArray())
         }

diff --git a/ktor-server/ktor-server-netty/jvm/src/io/ktor/server/netty/NettyChannelInitializer.kt b/ktor-server/ktor-server-netty/jvm/src/io/ktor/server/netty/NettyChannelInitializer.kt
@@ -161,7 +161,7 @@ public class NettyChannelInitializer(
     private fun EngineSSLConnectorConfig.trustManagerFactory(): TrustManagerFactory? {
         val trustStore = trustStore ?: trustStorePath?.let { file ->
             FileInputStream(file).use { fis ->
-                KeyStore.getInstance("JKS").also { it.load(fis, null) }
+                KeyStore.getInstance(KeyStore.getDefaultType()).also { it.load(fis, null) }
             }
         }
         return trustStore?.let { store ->