diff --git a/service/src/main/java/io/github/a13e300/tricky_store/keystore/CertHack.java b/service/src/main/java/io/github/a13e300/tricky_store/keystore/CertHack.java index 3b811c0..b361a6b 100644 --- a/service/src/main/java/io/github/a13e300/tricky_store/keystore/CertHack.java +++ b/service/src/main/java/io/github/a13e300/tricky_store/keystore/CertHack.java @@ -97,13 +97,13 @@ public final class CertHack { } private static PEMKeyPair parseKeyPair(String key) throws Throwable { - try (PEMParser parser = new PEMParser(new StringReader(key))) { + try (PEMParser parser = new PEMParser(new StringReader(UtilKt.trimLine(key)))) { return (PEMKeyPair) parser.readObject(); } } private static Certificate parseCert(String cert) throws Throwable { - try (PemReader reader = new PemReader(new StringReader(cert))) { + try (PemReader reader = new PemReader(new StringReader(UtilKt.trimLine(cert)))) { return certificateFactory.generateCertificate(new ByteArrayInputStream(reader.readPemObject().getContent())); } } diff --git a/service/src/main/java/io/github/a13e300/tricky_store/util.kt b/service/src/main/java/io/github/a13e300/tricky_store/util.kt index a4dd165..d79c83a 100644 --- a/service/src/main/java/io/github/a13e300/tricky_store/util.kt +++ b/service/src/main/java/io/github/a13e300/tricky_store/util.kt @@ -59,3 +59,4 @@ fun IPackageManager.getPackageInfoCompat(name: String, flags: Long, userId: Int) getPackageInfo(name, flags.toInt(), userId) } +fun String.trimLine() = trim().split("\n").joinToString("\n") { it.trim() }