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
This commit is contained in:
osm0sis committed 2017-06-16 17:00:46 -03:00
1 parent ec285b291a
commit 05cb01112d
1 file changed
+2 -2
+2 -2
View File
@@ -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;