From 637bb171c841e7f1ad35856a5e26fd476d2c8cd7 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 26 Feb 2020 18:42:08 -0500
Subject: [PATCH] Switch to partial 4096 signing keys by default

Update engine <10 doesn't support 4096-bit keys
Make releasekey 2048-bits
Verity has also been 2048-bits
The rest are 4096-bits
---
 Scripts/Generate_Signing_Keys.sh | 4 +++-
 Scripts/init.sh                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh
index 68132d65..51d454df 100644
--- a/Scripts/Generate_Signing_Keys.sh
+++ b/Scripts/Generate_Signing_Keys.sh
@@ -12,6 +12,9 @@ mkdir $1; cd $1;
 desc="/O=Divested Computing Group/CN=DivestOS for $1/emailAddress=support@divestos.org";
 
 sed -i '/blank for none/,+1 d' "$DOS_BUILD_BASE"/development/tools/make_key;
+
+sed -i 's/4096/2048/' "$DOS_BUILD_BASE"/development/tools/make_key;
+"$DOS_BUILD_BASE"/development/tools/make_key releasekey "$desc" "$type";
 sed -i 's/2048/4096/' "$DOS_BUILD_BASE"/development/tools/make_key;
 "$DOS_BUILD_BASE"/development/tools/make_key extra "$desc" "$type";
 "$DOS_BUILD_BASE"/development/tools/make_key future-1 "$desc" "$type";
@@ -19,7 +22,6 @@ sed -i 's/2048/4096/' "$DOS_BUILD_BASE"/development/tools/make_key;
 "$DOS_BUILD_BASE"/development/tools/make_key media "$desc" "$type";
 "$DOS_BUILD_BASE"/development/tools/make_key networkstack "$desc" "$type";
 "$DOS_BUILD_BASE"/development/tools/make_key platform "$desc" "$type";
-"$DOS_BUILD_BASE"/development/tools/make_key releasekey "$desc" "$type";
 "$DOS_BUILD_BASE"/development/tools/make_key shared "$desc" "$type";
 
 sed -i 's/4096/2048/' "$DOS_BUILD_BASE"/development/tools/make_key;
diff --git a/Scripts/init.sh b/Scripts/init.sh
index 1a99d45c..556e56a0 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -25,7 +25,7 @@ export ANDROID_HOME="/home/$USER/Android/Sdk";
 export DOS_WORKSPACE_ROOT="/mnt/dos/"; #XXX: THIS MUST BE CORRECT TO BUILD!
 #export DOS_BUILDS=$DOS_WORKSPACE_ROOT"Builds/";
 export DOS_BUILDS="/mnt/dosr/Builds/";
-export DOS_SIGNING_KEYS=$DOS_WORKSPACE_ROOT"Signing_Keys/4096";
+export DOS_SIGNING_KEYS=$DOS_WORKSPACE_ROOT"Signing_Keys/4096pro";
 #export USE_CCACHE=1;
 #export CCACHE_DIR="";
 #export DOS_BINARY_PATCHER="";