WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix the signing problem

This commit is contained in:
Nullptr 2021-08-24 20:43:58 +08:00
parent 8c0fe5646b
commit cdde935e14
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patch/src/main/java/org/lsposed/patch/LSPatch.java
View File

@ -288,7 +288,6 @@ public class LSPatch {
new SigningExtension(SigningOptions.builder() new SigningExtension(SigningOptions.builder()
.setMinSdkVersion(27) .setMinSdkVersion(27)
.setV1SigningEnabled(v1) .setV1SigningEnabled(v1)
// Don't know why it crashes !!
.setV2SigningEnabled(v2) .setV2SigningEnabled(v2)
.setCertificates((X509Certificate[]) entry.getCertificateChain()) .setCertificates((X509Certificate[]) entry.getCertificateChain())
.setKey(entry.getPrivateKey()) .setKey(entry.getPrivateKey())
@ -297,13 +296,11 @@ public class LSPatch {
throw new PatchError("Failed to sign apk: " + e.getMessage()); throw new PatchError("Failed to sign apk: " + e.getMessage());
} }
dstZFile.update();
FileUtils.copyFile(tmpApk, outputFile);
System.out.println("Done. Output APK: " + outputFile.getAbsolutePath()); System.out.println("Done. Output APK: " + outputFile.getAbsolutePath());
} finally { } finally {
try { try {
tmpApk.delete(); outputFile.delete();
FileUtils.moveFile(tmpApk, outputFile);
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }
} }

66
patch/src/main/java/org/lsposed/patch/util/NestedZipLink.java
View File

@ -6,11 +6,11 @@ import com.android.tools.build.apkzlib.zip.StoredEntry;
import com.android.tools.build.apkzlib.zip.ZFile; import com.android.tools.build.apkzlib.zip.ZFile;
import com.android.tools.build.apkzlib.zip.ZFileExtension; import com.android.tools.build.apkzlib.zip.ZFileExtension;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
public class NestedZipLink extends ZFileExtension { public class NestedZipLink extends ZFileExtension {
@ -54,14 +54,7 @@ public class NestedZipLink extends ZFileExtension {
deleteDirectoryAndEocd.setAccessible(true); deleteDirectoryAndEocd.setAccessible(true);
deleteDirectoryAndEocd.invoke(zFile); deleteDirectoryAndEocd.invoke(zFile);
appendEntries(); appendEntries();
Method computeCentralDirectory = ZFile.class.getDeclaredMethod("computeCentralDirectory");
computeCentralDirectory.setAccessible(true);
computeCentralDirectory.invoke(zFile);
Method computeEocd = ZFile.class.getDeclaredMethod("computeEocd");
computeEocd.setAccessible(true);
computeEocd.invoke(zFile);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
var ex = new IOException("Error when writing link entries"); var ex = new IOException("Error when writing link entries");
ex.addSuppressed(e); ex.addSuppressed(e);
throw ex; throw ex;
@ -69,39 +62,44 @@ public class NestedZipLink extends ZFileExtension {
written = true; written = true;
} }
private void appendEntries() throws IOException { private void appendEntries() throws Exception {
Field field_entry_file = StoredEntry.class.getDeclaredField("file");
field_entry_file.setAccessible(true);
Field field_entries = ZFile.class.getDeclaredField("entries");
field_entries.setAccessible(true);
Field field_cdh_file = CentralDirectoryHeader.class.getDeclaredField("file");
field_cdh_file.setAccessible(true);
Field field_offset = CentralDirectoryHeader.class.getDeclaredField("offset");
field_offset.setAccessible(true);
Method makeFree = Class.forName("com.android.tools.build.apkzlib.zip.FileUseMapEntry")
.getDeclaredMethod("makeUsed", long.class, long.class, Object.class);
makeFree.setAccessible(true);
Method computeCentralDirectory = ZFile.class.getDeclaredMethod("computeCentralDirectory");
computeCentralDirectory.setAccessible(true);
Method computeEocd = ZFile.class.getDeclaredMethod("computeEocd");
computeEocd.setAccessible(true);
var entries = (Map<String, Object>) field_entries.get(zFile);
for (var nestedZip : nestedZips) { for (var nestedZip : nestedZips) {
long nestedZipOffset = nestedZip.entry.getCentralDirectoryHeader().getOffset(); long nestedZipOffset = nestedZip.entry.getCentralDirectoryHeader().getOffset();
for (var link : nestedZip.links) { for (var link : nestedZip.links) {
var entry = nestedZip.zip.get(link); var entry = nestedZip.zip.get(link);
if (entry == null) throw new IOException("Entry " + link + " does not exist in nested zip"); if (entry == null) throw new IOException("Entry " + link + " does not exist in nested zip");
CentralDirectoryHeader cdh = entry.getCentralDirectoryHeader(); CentralDirectoryHeader cdh = entry.getCentralDirectoryHeader();
CentralDirectoryHeader clonedCdh; field_entry_file.set(entry, zFile);
field_cdh_file.set(cdh, zFile);
try { field_offset.set(cdh, nestedZipOffset + cdh.getOffset() + nestedZip.entry.getLocalHeaderSize());
Method clone = CentralDirectoryHeader.class.getDeclaredMethod("clone"); var newFileUseMapEntry = makeFree.invoke(null, 0, 1, entry);
clone.setAccessible(true); entries.put(link, newFileUseMapEntry);
clonedCdh = (CentralDirectoryHeader) clone.invoke(cdh);
zFile.add(link, new ByteArrayInputStream(new byte[0]));
StoredEntry newEntry = zFile.get(link);
Field field_file = CentralDirectoryHeader.class.getDeclaredField("file");
field_file.setAccessible(true);
field_file.set(clonedCdh, zFile);
Field field_offset = CentralDirectoryHeader.class.getDeclaredField("offset");
field_offset.setAccessible(true);
field_offset.set(clonedCdh, nestedZipOffset + cdh.getOffset() + nestedZip.entry.getLocalHeaderSize());
Field field_cdh = StoredEntry.class.getDeclaredField("cdh");
field_cdh.setAccessible(true);
field_cdh.set(newEntry, clonedCdh);
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
computeCentralDirectory.invoke(zFile);
computeEocd.invoke(zFile);
} }
} }