From 05cb01112d075ef8a15f8ab94bdc1f11cccebd82 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Fri, 16 Jun 2017 17:00:46 -0300
Subject: [PATCH] AK2: accept .pem certificates for AVB signing - turns out
 BootSignature.jar accepts .pem as well as .der - AOSP uses "verity" keys by
 default for boot signatures:
 https://github.com/android/platform_build/tree/master/target/product/security

---
 tools/ak2-core.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ak2-core.sh b/tools/ak2-core.sh
index 2c78872..8306c54 100755
--- a/tools/ak2-core.sh
+++ b/tools/ak2-core.sh
@@ -199,8 +199,8 @@ write_boot() {
     fi;
     unset LD_LIBRARY_PATH;
     pk8=`ls $bin/avb/*.pk8`;
-    der=`ls $bin/avb/*.der`;
-    /system/bin/dalvikvm -Xbootclasspath:/system/framework/core-oj.jar:/system/framework/core-libart.jar:/system/framework/conscrypt.jar:/system/framework/bouncycastle.jar -Xnodex2oat -Xnoimage-dex2oat -cp BootSignature_Android.jar com.android.verity.BootSignature /boot boot-new.img $pk8 $der boot-new-signed.img;
+    cert=`ls $bin/avb/*.x509.*`;
+    /system/bin/dalvikvm -Xbootclasspath:/system/framework/core-oj.jar:/system/framework/core-libart.jar:/system/framework/conscrypt.jar:/system/framework/bouncycastle.jar -Xnodex2oat -Xnoimage-dex2oat -cp BootSignature_Android.jar com.android.verity.BootSignature /boot boot-new.img $pk8 $cert boot-new-signed.img;
     if [ $? != 0 ]; then
       ui_print " "; ui_print "Signing image failed. Aborting..."; exit 1;
     fi;