Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b55d7a0a authored by Mathew Inwood's avatar Mathew Inwood
Browse files

Replace debug key. 

This gives better consistency with the release key. Also improve the
debug_sign script to use base64, to eliminate issues with escaping and
newlines.

Bug: 110509075
Test: atest CtsSignedConfigHostTestCases
Change-Id: Id8d7b6b5bee3340803d30d3a4a34c7e62f565a93
parent 6fee8818

services/core/java/com/android/server/signedconfig/SignatureVerifier.java

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ public class SignatureVerifier { 
    private static final boolean DBG = false;



    private static final String DEBUG_KEY =

            "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEaAn2XVifsLTHg616nTsOMVmlhBoECGbTEBTKKvdd2hO60"

            + "pj1pnU8SMkhYfaNxZuKgw9LNvOwlFwStboIYeZ3lQ==";

            "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmJKs4lSn+XRhMQmMid+Zbhbu13YrU1haIhVC5296InRu1"

            + "x7A8PV1ejQyisBODGgRY6pqkAHRncBCYcgg5wIIJg==";

    private static final String PROD_KEY =

            "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+lky6wKyGL6lE1VrD0YTMHwb0Xwc+tzC8MvnrzVxodvTp"

            + "VY/jV7V+Zktcx+pry43XPABFRXtbhTo+qykhyBA1g==";

tools/signedconfig/debug_key.pem

+3 −3
Original line number Diff line number Diff line 
-----BEGIN EC PRIVATE KEY-----

MHcCAQEEIEfgtO+KPOoqJqTnqkDDKkAcOzyvtovsUO/ShLE6y4XRoAoGCCqGSM49

AwEHoUQDQgAEaAn2XVifsLTHg616nTsOMVmlhBoECGbTEBTKKvdd2hO60pj1pnU8

SMkhYfaNxZuKgw9LNvOwlFwStboIYeZ3lQ==

MHcCAQEEIFbNNr1/TsFlvnmH1z6e0xyact9t7PDs+VFWc7QFtoRcoAoGCCqGSM49

AwEHoUQDQgAEmJKs4lSn+XRhMQmMid+Zbhbu13YrU1haIhVC5296InRu1x7A8PV1

ejQyisBODGgRY6pqkAHRncBCYcgg5wIIJg==

-----END EC PRIVATE KEY-----

tools/signedconfig/debug_public.pem

+2 −2
Original line number Diff line number Diff line 
-----BEGIN PUBLIC KEY-----

MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEaAn2XVifsLTHg616nTsOMVmlhBoE

CGbTEBTKKvdd2hO60pj1pnU8SMkhYfaNxZuKgw9LNvOwlFwStboIYeZ3lQ==

MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmJKs4lSn+XRhMQmMid+Zbhbu13Yr

U1haIhVC5296InRu1x7A8PV1ejQyisBODGgRY6pqkAHRncBCYcgg5wIIJg==

-----END PUBLIC KEY-----

tools/signedconfig/debug_sign.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
# Script to sign data with the debug keys. Outputs base64 for embedding into

# APK metadata.



openssl dgst -sha256 -sign $(dirname $0)/debug_key.pem  $1 | base64 -w 0

openssl dgst -sha256 -sign $(dirname $0)/debug_key.pem  <(echo -n "$1" | base64 -d) | base64 -w 0

echo