fix could not import PEM certificates

sunny-chung · Nov 15, 2024 · 6066881 · 6066881
1 parent 6fb6a03
commit 6066881
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/util/Pkix.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/util/Pkix.kt
@@ -255,7 +255,9 @@ fun ClientCertificateKeyPair.Companion.importFrom(bundleFile: File, keyStorePass
 }
 
 fun parseCaCertificates(bytes: ByteArray) : List<X509Certificate> {
-    val certBytes = bytes.tryToConvertPemToDer(startLine = "-----BEGIN PKCS7-----", endLine = "-----END PKCS7-----")
+    val certBytes = bytes
+        .tryToConvertPemToDer(startLine = "-----BEGIN CERTIFICATE-----", endLine = "-----END CERTIFICATE-----")
+        .tryToConvertPemToDer(startLine = "-----BEGIN PKCS7-----", endLine = "-----END PKCS7-----")
     return CertificateFactory.getInstance("X.509")
         .generateCertificates(ByteArrayInputStream(certBytes)).map { it as X509Certificate }
 }