Add boot signing

app/src/main/java/com/topjohnwu/magisk/utils/BootSigner.java

@@ -0,0 +1,46 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.res.AssetManager;
+
+import com.topjohnwu.crypto.SignBoot;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+public class BootSigner {
+
+    public static void main(String[] args) throws Exception {
+        if ("-verify".equals(args[0])) {
+            String certPath = "";
+            if (args.length >= 4 && "-certificate".equals(args[2])) {
+                /* args[3] is the path to a public key certificate */
+                certPath = args[3];
+            }
+            /* args[1] is the path to a signed boot image */
+            boolean signed = SignBoot.verifySignature(args[1],
+                    certPath.isEmpty() ? null : new FileInputStream(certPath));
+            System.exit(signed ? 0 : 1);
+        } else {
+            /* args[0] is the target name, typically /boot
+               args[1] is the path to a boot image to sign
+               args[2] is the path where to output the signed boot image
+               args[3] is the path to a private key
+               args[4] is the path to the matching public key certificate
+            */
+            InputStream keyIn, sigIn;
+            if (args.length >= 5) {
+                keyIn = new FileInputStream(args[3]);
+                sigIn = new FileInputStream(args[4]);
+            } else {
+                /* Use internal test keys */
+                AssetManager asset = Utils.getAssets(System.getProperty("java.class.path"));
+                if (asset == null)
+                    System.exit(1);
+                keyIn = asset.open(ZipUtils.PRIVATE_KEY_NAME);
+                sigIn = asset.open(ZipUtils.PUBLIC_KEY_NAME);
+            }
+
+            SignBoot.doSignature(args[0], args[1], args[2], keyIn, sigIn);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
@@ -203,4 +204,15 @@ public class Utils {
     public static File getDatabasePath(Context context, String dbName) {
         return new File(context.getFilesDir().getParent() + "/databases", dbName);
     }
+
+    public static AssetManager getAssets(String apk) {
+        try {
+            AssetManager asset = AssetManager.class.newInstance();
+            AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
+            return asset;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java

@@ -2,8 +2,8 @@ package com.topjohnwu.magisk.utils;
 
 import android.content.res.AssetManager;
 
-import com.topjohnwu.jarsigner.JarMap;
-import com.topjohnwu.jarsigner.SignAPK;
+import com.topjohnwu.crypto.JarMap;
+import com.topjohnwu.crypto.SignAPK;
 import com.topjohnwu.magisk.MagiskManager;
 
 import java.io.BufferedInputStream;
@@ -16,8 +16,8 @@ import java.util.jar.JarInputStream;
 
 public class ZipUtils {
     // File name in assets
-    private static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
-    private static final String PRIVATE_KEY_NAME = "private.key.pk8";
+    static final String PUBLIC_KEY_NAME = "public.certificate.x509.pem";
+    static final String PRIVATE_KEY_NAME = "private.key.pk8";
 
     static {
         System.loadLibrary("zipadjust");