diff options
| author | 2019-01-23 17:52:39 +0000 | |
|---|---|---|
| committer | 2019-01-24 10:02:00 +0000 | |
| commit | b55d7a0a9dfab68a65906429ba4d7d54452347be (patch) | |
| tree | 92f3dc60ed08214176f5f5ff71004a4df93b756f | |
| parent | 6fee8818700e435c5c4f8aa590259af4dd9e3eae (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/signedconfig/SignatureVerifier.java | 4 | ||||
| -rw-r--r-- | tools/signedconfig/debug_key.pem | 6 | ||||
| -rw-r--r-- | tools/signedconfig/debug_public.pem | 4 | ||||
| -rwxr-xr-x | tools/signedconfig/debug_sign.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java index 56db32a3071d..146c51688531 100644 --- a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java +++ b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java @@ -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=="; diff --git a/tools/signedconfig/debug_key.pem b/tools/signedconfig/debug_key.pem index 0af577bf81e1..17a1dff71707 100644 --- a/tools/signedconfig/debug_key.pem +++ b/tools/signedconfig/debug_key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIEfgtO+KPOoqJqTnqkDDKkAcOzyvtovsUO/ShLE6y4XRoAoGCCqGSM49 -AwEHoUQDQgAEaAn2XVifsLTHg616nTsOMVmlhBoECGbTEBTKKvdd2hO60pj1pnU8 -SMkhYfaNxZuKgw9LNvOwlFwStboIYeZ3lQ== +MHcCAQEEIFbNNr1/TsFlvnmH1z6e0xyact9t7PDs+VFWc7QFtoRcoAoGCCqGSM49 +AwEHoUQDQgAEmJKs4lSn+XRhMQmMid+Zbhbu13YrU1haIhVC5296InRu1x7A8PV1 +ejQyisBODGgRY6pqkAHRncBCYcgg5wIIJg== -----END EC PRIVATE KEY----- diff --git a/tools/signedconfig/debug_public.pem b/tools/signedconfig/debug_public.pem index f61f81322b94..d9f0d387b823 100644 --- a/tools/signedconfig/debug_public.pem +++ b/tools/signedconfig/debug_public.pem @@ -1,4 +1,4 @@ -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEaAn2XVifsLTHg616nTsOMVmlhBoE -CGbTEBTKKvdd2hO60pj1pnU8SMkhYfaNxZuKgw9LNvOwlFwStboIYeZ3lQ== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmJKs4lSn+XRhMQmMid+Zbhbu13Yr +U1haIhVC5296InRu1x7A8PV1ejQyisBODGgRY6pqkAHRncBCYcgg5wIIJg== -----END PUBLIC KEY----- diff --git a/tools/signedconfig/debug_sign.sh b/tools/signedconfig/debug_sign.sh index 28e54289f8f8..3a2814a62aff 100755 --- a/tools/signedconfig/debug_sign.sh +++ b/tools/signedconfig/debug_sign.sh @@ -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 |