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

Commit 548fb61c authored by Hunter Knepshield's avatar Hunter Knepshield Committed by Automerger Merge Worker
Browse files

Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e631 

Original change: https://android-review.googlesource.com/c/platform/build/+/1559795

Change-Id: I2c612f2eaf55837219f99c339bb64972be8edec2
parents d1060db7 bca0e631

target/product/security/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -13,7 +13,16 @@ android_app_certificate { 
    certificate: "testkey",

}



// Google-owned certificate for CTS testing, since we can't trust arbitrary keys on release devices.

// Certificate for CTS tests that rely on UICC hardware conforming to the

// updated CTS UICC card specification introduced in 2021. See

// //cts/tests/tests/carrierapi/Android.bp for more details.

android_app_certificate {

    name: "cts-uicc-2021-testkey",

    certificate: "cts_uicc_2021",

}



// Google-owned certificate for CTS testing, since we can't trust arbitrary keys

// on release devices.

prebuilt_etc {

    name: "fsverity-release-cert-der",

    src: "fsverity-release.x509.der",

target/product/security/README

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ The following commands were used to generate the test key pairs: 
  development/tools/make_key platform      '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/emailAddress=android@android.com'

  development/tools/make_key shared        '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/emailAddress=android@android.com'

  development/tools/make_key media         '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/emailAddress=android@android.com'

  development/tools/make_key cts_uicc_2021 '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/emailAddress=android@android.com'



signing using the openssl commandline (for boot/system images)

--------------------------------------------------------------

target/product/security/cts_uicc_2021.pk8

0 → 100644
+1.19 KiB

File added.

No diff preview for this file type.

View file

target/product/security/cts_uicc_2021.x509.pem

0 → 100644
+24 −0
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIIECzCCAvOgAwIBAgIUHYLIIL60vWPD6aOBwZUcdbsae+cwDQYJKoZIhvcNAQEL

BQAwgZQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH

DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy

b2lkMRAwDgYDVQQDDAdBbmRyb2lkMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFu

ZHJvaWQuY29tMB4XDTIxMDEyNjAwMjAyMVoXDTQ4MDYxMzAwMjAyMVowgZQxCzAJ

BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFp

biBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRyb2lkMRAwDgYD

VQQDDAdBbmRyb2lkMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29t

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlOMSHqBu0ihUDfFgwMfO

pJtpyxHe0KKfHRndUQcYU/1v6/auy2YqkgKv+AraoukuU3gJeOiWoaqaWFNcm6md

WfGRNT4oABhhNS43n5PI4NlLjI4yeUJJppZn5LPpc/8vZ0P8ZFE9CJmtckCh+hES

BzqnxkCnq1PoxlcF3S/f8lOtd6ymaMDf3sYcePaoU8yTWFksl7EWRVwhBUIf7/r8

epbNiV14/aH2cQfHVfpf54TIdk7s0/ehVA70A5gQp7Utn6mY2zEJlMrTKWRqA/a5

oYiob3y+v2JWNcljHY6twwDOGwW7G0NWJVtaWj76Z3o9RpIhAglivhOrHTflIU3+

2QIDAQABo1MwUTAdBgNVHQ4EFgQUZJ1oGb33n/OY+Mm8ykci4I6c9OcwHwYDVR0j

BBgwFoAUZJ1oGb33n/OY+Mm8ykci4I6c9OcwDwYDVR0TAQH/BAUwAwEB/zANBgkq

hkiG9w0BAQsFAAOCAQEASajvU0KCN2kfATPV95LQVE3N/URPi/lX9MfQptE54E+R

6dHwHQIwU/fBFapAHfGgrpwUZftJO+Bad2iu5s1IhTJ0Q5v0yHdvWfo4EzVeMzPV

+/DWU786pPEomFkb9ZKhgVkFNPcbXlkUm/9HxRHPRTm8x+BE/75PKI+kh+pDmM+P

5v4W0qDKPgFzIY/D4F++gVyPZ3O+/GhunjsJozO+dvN+50FH6o/kBHm2+QqQNYPW

f232F3CYtH4uWI0TkbwmSvVGW8iOqh330Cef5zqwSdOkzybUirXFsHUu1Zad1aLT

t0mu6RgNEmX8efOQCcz2Z/on8lkIAxCBwLX7wkH5JA==

-----END CERTIFICATE-----