From 085ea6d0a1ba295fa26fd6d06d5b9eac69cf5c47 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Thu, 4 Jul 2019 03:20:09 -0300
Subject: [PATCH] SignBoot: use verity keys not testkey to correctly follow
 AOSP

---
 .../java/com/topjohnwu/signing/SignBoot.java  |   4 +--
 signing/src/main/resources/keys/verity.pk8    | Bin 0 -> 1219 bytes
 .../src/main/resources/keys/verity.x509.pem   |  24 ++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 signing/src/main/resources/keys/verity.pk8
 create mode 100644 signing/src/main/resources/keys/verity.x509.pem

diff --git a/signing/src/main/java/com/topjohnwu/signing/SignBoot.java b/signing/src/main/java/com/topjohnwu/signing/SignBoot.java
index e75357e8b..5e8086bbb 100644
--- a/signing/src/main/java/com/topjohnwu/signing/SignBoot.java
+++ b/signing/src/main/java/com/topjohnwu/signing/SignBoot.java
@@ -87,12 +87,12 @@ public class SignBoot {
             in.unread(hdr);
             BootSignature bootsig = new BootSignature(target, signableSize);
             if (cert == null) {
-                cert = SignBoot.class.getResourceAsStream("/keys/testkey.x509.pem");
+                cert = SignBoot.class.getResourceAsStream("/keys/verity.x509.pem");
             }
             X509Certificate certificate = CryptoUtils.readCertificate(cert);
             bootsig.setCertificate(certificate);
             if (key == null) {
-                key = SignBoot.class.getResourceAsStream("/keys/testkey.pk8");
+                key = SignBoot.class.getResourceAsStream("/keys/verity.pk8");
             }
             PrivateKey privateKey = CryptoUtils.readPrivateKey(key);
             byte[] sig = bootsig.sign(privateKey, in, signableSize);
diff --git a/signing/src/main/resources/keys/verity.pk8 b/signing/src/main/resources/keys/verity.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..bebf216cb6004b5c6665d044916c8a5a70f4a12b
GIT binary patch
literal 1219
zcmV;!1U&mNf&{+;0RS)!1_>&LNQU<f0RaI800e>rsW5^Br2+u}0)hbn0O;#@O)pJU
zk$QWxJKN`JXXMf3GhwFmf~sQc5HpLXW)JJ2phAh6v*Nf;L&5#EipG7q6%@NiP&1C5
zD~cQ|6A`V+<{KQH7JjIH&CU#y7dlJ!fThd)S6dMGLvI}2yUh2>PnPSuoiq2=?Pl6T
zaL&?6?)ogsYESo1ja=sH7nu(=P}@Mw5wjV{O;vLyTI9w$NIFyP2-!D#E6lG@#i0RX
z&!nR5RDWv#zEjRN4M*Lg&C;CDa3e;-HwifHrX@fGXP418BSkBj2eQ2ou6i9`juh0o
zBU4X}(EAjGp~z`!sh3nbKon($r*4=YPm_B<zOK5b2Bw70k*RL#Ndf}_009Dm0RVXP
zHow+Qks1#I2i%b0##07&oXWNCPEkONC&zsa3%o0iP!@?74YOs85>ShO<@1mVAVlm$
zD9=<zz6Gl--;9EUzA*V|O@=M?@C%Lc=e&zBfo$U}U->yWK|e}|G5TSFSQRFzdH*xY
zgIPN*BNBwfol-TXX5#p5)M)dPl7jmJQ2Gv(*Ym!j$FB{5swvIpd-Slm)`GxcHM>N<
z=qwC5ks5erFMHPzIEXs4156qVPhcaHx|jz4_eld#x|4N6g;ISU`V^mclfpv-O5-}s
zCDaLL1Up}63MrecTJ4u}ku{vxgXcqjtWUEC09s5Q2)zY>lWfc=X<iiXu7Lu9fdKUn
zA`iZwh1pY`mDQeVj7lNMB*j}Np&9^pBR)8iDtV_z#5St;_6y1Ut6{dlB>uX&<h2Pb
zM?I<Ieha_sE#`3!iB4v+ruv`VAL6FxOo<!9O4D>M^1V3`QYB$9*s{u3$!abr0$fUJ
z-12GL=T3KRPhSrASRWx<uDkhaUs(cyfdKPSm#ND5fF_VolJbtCY>C4Q0urGV;N^XA
z(~i%%tC+CGVzR;ACxiZOzztALDPz}*l?T220d|ALu*L%VKTw`qR9YCy6s^XC;N|^x
zul<D1RD3IO_Bw;Uz-nlL$S5o|Qz*!=0rO4SiFnw#z?9tOb-zj3Fv?-{p^%y?^l<`#
zfdH(+z-EmibpRt=gBKVXQBkSGDS05QEqviS98+%^Olx~Avi(0sljQfl^DAxS!>{=N
zxMq-2@ZMecjS<Irzgj2t@q(TY@O#@^&Tzo(YaMmIVRiKYYz$685yD(#O+c<Wc{?l8
z^yd#}ir_O8-dc$RJmYNdp5{Yj87WuFPw@hQfdJ#%>-do1NIF#cZ?k}jaJ5br_xSWG
zb~V#f9(rZtO=Is~*?;GDu(P&EhR3l3vD*_CUl`&1rfw4z)+vb2OAfb9b>HpD2)1|X
zHff6lW9d0QbM@FopS{X-j{?^ndXUUrpQG5+qVDrwoszQpxbtr<-zTL5q~cNgVs+&@
z2C)KxfdHOmL!fWm!wfP<2Mlq=g8;nS3Mq#2s_*R^>nR|;8&bwy?9T|Fo6wYa_|xdV
zOUs<Zu1zJwZK;-5aUT>Z*;cW!aem(yO0-@)ToG{KSNO$)g^D87t%DobVP%fxxWmfP
hk4vOBJnVsAiAcI)+4Ln>*X%OBo25xJ{%5YX31a)eQE>nO

literal 0
HcmV?d00001

diff --git a/signing/src/main/resources/keys/verity.x509.pem b/signing/src/main/resources/keys/verity.x509.pem
new file mode 100644
index 000000000..86399c3c1
--- /dev/null
+++ b/signing/src/main/resources/keys/verity.x509.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID/TCCAuWgAwIBAgIJAJcPmDkJqolJMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
+VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
+AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
+Fw0xNDExMDYxOTA3NDBaFw00MjAzMjQxOTA3NDBaMIGUMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
+A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
+ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOjreE0vTVSRenuzO9vnaWfk0eQzYab0gqpi
+6xAzi6dmD+ugoEKJmbPiuE5Dwf21isZ9uhUUu0dQM46dK4ocKxMRrcnmGxydFn6o
+fs3ODJMXOkv2gKXL/FdbEPdDbxzdu8z3yk+W67udM/fW7WbaQ3DO0knu+izKak/3
+T41c5uoXmQ81UNtAzRGzGchNVXMmWuTGOkg6U+0I2Td7K8yvUMWhAWPPpKLtVH9r
+AL5TzjYNR92izdKcz3AjRsI3CTjtpiVABGeX0TcjRSuZB7K9EK56HV+OFNS6I1NP
+jdD7FIShyGlqqZdUOkAUZYanbpgeT5N7QL6uuqcGpoTOkalu6kkCAwEAAaNQME4w
+HQYDVR0OBBYEFH5DM/m7oArf4O3peeKO0ZIEkrQPMB8GA1UdIwQYMBaAFH5DM/m7
+oArf4O3peeKO0ZIEkrQPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AHO3NSvDE5jFvMehGGtS8BnFYdFKRIglDMc4niWSzhzOVYRH4WajxdtBWc5fx0ix
+NF/+hVKVhP6AIOQa+++sk+HIi7RvioPPbhjcsVlZe7cUEGrLSSveGouQyc+j0+m6
+JF84kszIl5GGNMTnx0XRPO+g8t6h5LWfnVydgZfpGRRg+WHewk1U2HlvTjIceb0N
+dcoJ8WKJAFWdcuE7VIm4w+vF/DYX/A2Oyzr2+QRhmYSv1cusgAeC1tvH4ap+J1Lg
+UnOu5Kh/FqPLLSwNVQp4Bu7b9QFfqK8Moj84bj88NqRGZgDyqzuTrFxn6FW7dmyA
+yttuAJAEAymk1mipd9+zp38=
+-----END CERTIFICATE-----