br0kenpixel/TrickyStore
1
0
Fork 0
mirror of https://github.com/5ec1cff/TrickyStore.git synced 2025-09-06 06:37:07 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

trim line

Browse Source
This commit is contained in:
5ec1cff
2024-07-16 22:25:03 +08:00
parent 52b3fcf5ad
commit 2912d53198
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/io/github/a13e300/tricky_store/keystore/CertHack.java
View File

@@ -97,13 +97,13 @@ public final class CertHack {
} }
private static PEMKeyPair parseKeyPair(String key) throws Throwable { 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(); return (PEMKeyPair) parser.readObject();
} }
} }
private static Certificate parseCert(String cert) throws Throwable { 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())); return certificateFactory.generateCertificate(new ByteArrayInputStream(reader.readPemObject().getContent()));
} }
} }

1
service/src/main/java/io/github/a13e300/tricky_store/util.kt
View File

@@ -59,3 +59,4 @@ fun IPackageManager.getPackageInfoCompat(name: String, flags: Long, userId: Int)
getPackageInfo(name, flags.toInt(), userId) getPackageInfo(name, flags.toInt(), userId)
} }
fun String.trimLine() = trim().split("\n").joinToString("\n") { it.trim() }