diff --git a/src/main/kotlin/pemToJks/main.kt b/src/main/kotlin/pemToJks/main.kt index 27c723e..15e2dd2 100644 --- a/src/main/kotlin/pemToJks/main.kt +++ b/src/main/kotlin/pemToJks/main.kt @@ -154,7 +154,7 @@ fun addToKeyStore(ksFile: File, ksPass: CharArray, alias: String, aliasPass: Cha ks.setKeyEntry(alias, key, aliasPass, chain) } else { println("Adding certificate entries to keystore") - chain.forEach { ks.setCertificateEntry(alias, it) } + chain.forEachIndexed { idx, cert -> ks.setCertificateEntry(alias + idx, cert) } } println("Saving keystore") diff --git a/src/test/kotlin/pemToJks/MainTest.kt b/src/test/kotlin/pemToJks/MainTest.kt index 0d16797..1dcc904 100644 --- a/src/test/kotlin/pemToJks/MainTest.kt +++ b/src/test/kotlin/pemToJks/MainTest.kt @@ -72,7 +72,7 @@ class MainTest { } @Test - fun shouldWriteFirstCertToKeyStore() { + fun shouldWriteCertsToKeyStore() { val certs = readCertChain(certFile) addToKeyStore(ksFile, ksPass, alias, aliasPass, certs.toTypedArray(), null) @@ -80,7 +80,8 @@ class MainTest { val ks = KeyStore.getInstance("JKS") ksFile.inputStream().use { ks.load(it, ksPass) } - assertEquals(certs[0], ks.getCertificate(alias)) + assertEquals(certs[0], ks.getCertificate("alias0")) + assertEquals(certs[1], ks.getCertificate("alias1")) } @Test