From 377e70ae9fd98b027ead17b1d5e9a7aff52f1e17 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Thu, 3 Dec 2015 12:52:23 -0800 Subject: [PATCH] Stop using 512 bit RSA keys in keyset unit tests. This switches keyset unit tests from two unrealistically short 512 bit RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key. Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd --- .../apks/keyset/permUse/AndroidManifest.xml | 4 +-- .../apks/keyset/uA/AndroidManifest.xml | 2 +- .../apks/keyset/uAB/AndroidManifest.xml | 4 +-- .../apks/keyset/uAuB/AndroidManifest.xml | 4 +-- .../apks/keyset/uB/AndroidManifest.xml | 2 +- core/tests/coretests/certs/keyset_A.pk8 | Bin 344 -> 1216 bytes core/tests/coretests/certs/keyset_A.x509.pem | 28 ++++++++++-------- core/tests/coretests/certs/keyset_B.pk8 | Bin 345 -> 138 bytes core/tests/coretests/certs/keyset_B.x509.pem | 20 +++++-------- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml b/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml index b7645b01033e4..c56079f8d3cf9 100644 --- a/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml @@ -21,11 +21,11 @@ + android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB"/> + android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" /> diff --git a/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml index f31b75f9cda84..8c440f54993b2 100644 --- a/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml @@ -20,7 +20,7 @@ + android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB"/> diff --git a/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml index 8ad3471d72a4d..015c3ad2993e5 100644 --- a/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml @@ -20,9 +20,9 @@ + android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB" /> + android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" /> diff --git a/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml index cdbd63936e82a..9491dbeacc481 100644 --- a/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml @@ -20,11 +20,11 @@ + android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpNthdOxud7roPDZMMomOqXgJJdRfIWpkKEqmC61Mv+Nf6QY3TorEwJeghjSmqj7IbBKrtvfQq4E2XJO1HuspmQO4Ng2gvn+r+6EwNfKc9k55d6s+27SR867jKurBbHNtZMG+tjL1yH4r+tNzcuJCsgyAFqLmxFdcxEwzNvREyRpoYc5RDR0mmTwkMCUhJ6CId1EYEKiCEdNzxv+fWPEb21u+/MWpleGCILs8kglRVb2q/WOzAAvGr4FY5plfaE6N+lr7+UschQ+aMi1+uqewo2o0qPFVmZP5hnwj55K4UMzu/NhhDqQQsX4cSGES1KgHo5MTqRqZjN/I7emw5pFQIDAQAB" /> + android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" /> diff --git a/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml index 61063c3477cea..f4918400f38b6 100644 --- a/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml @@ -20,7 +20,7 @@ + android:value="MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEtGr5cL2N7ztHiHmphB1/1eq+43lEAmP36iiEJAfX+cVReGSPFXqNnnM8Vptd2boAe332lrFw9rKPmbkZA+jOTA==" /> diff --git a/core/tests/coretests/certs/keyset_A.pk8 b/core/tests/coretests/certs/keyset_A.pk8 index 3976b941f7d82a98a00fba6af4bb832321c65994..407631376ed95fbd31e50d70deb9d0de656475aa 100644 GIT binary patch literal 1216 zcmV;x1V8&Qf&{z*0RS)!1_>&LNQUrrZ9p8q5=T`0)hbn0IDxdkQwAN{qFAfNZ5oMk?U;``bnicM`Cr`N)ty$Oj zcpEPLqCJNFoVvA1pg^)s3c`e~g)hC;!f;O=0M)kFqKO{>fqwGs{gQj14Nt-CH%<6w zJjQDv(yFdjVLsW@;y+HzjfdJkF z3sM|m`tU0Fn)jd-O+Qnq^4lr~HOmUeosFXAV@HN{3sUHI2zp!>8=>6`L~FYD$VFFV zR75)3t5R@&OAr5B;wsg4GWG6<=w>hdYaFP!EVxcTDAt`Gs9%3_E}VD5IU`)49y;+t zDdC=8{-#_R>$f9NI+Yvs8Leh0-30=HfdI?e3bthS*lRU^i7QHQhX=qvE&KCmDVreS`=amgOmtYlCDa3MtfA`$!DPP~$TV#ktUy*Tig>Hc?6a8RLnxa$}4 z^&qm&+_5s*U|(3<0}CH6BuJNhP~|$$u(4d^zg+HZu+i|+#}OQUK_E}niT`j*n9%}( zfL?yCD%Q2dPOqDMspQgsMsnYzfKCyZ8|h2)}XCsH0MU6$R-z zO&O$g4+%}Ws#_P2TkTKPjkpz{-rDk^tjE*(Y6b0&B$!jqg7uh7TgK0eJj&i+%h16&$f8cU!69t0edYA%G9^H~*aR z0)c=C(kh6$&LW#?DwuCcGky(2D!NgX-+Mrl#e*y=m*qu|iM>UA6V?j^B3?|sWp`?j zAX4XwY;!Z5B~R{w3_a~@99IlrU?4|3iRAfNO$e`pna^qrA)t+hP_s!tb{W8Yz**O4 e!~U3VCeNh<2!{&xjF2r-shY(v4oh3G2bPWHT{)Ei literal 344 zcmV-e0jK^jf&o+l0RS)!1_>&LNQUoJ}`m-IsyRz0zm+p4bTzP{wf{hCrN9z_#THpd9rJ}(i-QG(|4)*CG|>Nmc{ z+j5Pcw-$$&7?QJpE7pyl#~*j7xB&to0Lp>OY)g=oxZkV4Q1F<#?{rvMcUXn~-cdX! zOAr8l0|Frc!oPd9@sgu9!NQhlb|)9`OqhsK9C{&+W!IrD?lKu+0wDm%qHYWxmEm)R zPoW+yG4#u~rmY1$bdA1n7rY90ku^sGAW}^E%KAJm9fjoP3(Jz(+XI8Lm=vJMZIwKG qF^U*M0RkXz^1JGN>L(ilI%U`u**yn3J@5AH3VD438cRYsPvw_^DU-qg diff --git a/core/tests/coretests/certs/keyset_A.x509.pem b/core/tests/coretests/certs/keyset_A.x509.pem index 0fe334eed85e8..548bf130593f0 100644 --- a/core/tests/coretests/certs/keyset_A.x509.pem +++ b/core/tests/coretests/certs/keyset_A.x509.pem @@ -1,14 +1,18 @@ -----BEGIN CERTIFICATE----- -MIICKjCCAdQCCQCpDXPnNpO5UjANBgkqhkiG9w0BAQUFADCBmzELMAkGA1UEBhMC -VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcx -DzANBgNVBAoTBkdvb2dsZTEQMA4GA1UECxMHQW5kcm9pZDEYMBYGA1UEAxMPd3d3 -LmV4YW1wbGUuY29tMSIwIAYJKoZIhvcNAQkBFhNkY2FzaG1hbkBnb29nbGUuY29t -MB4XDTE0MDQyMTE4MTkwM1oXDTE3MDQyMDE4MTkwM1owgZsxCzAJBgNVBAYTAlVT -MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MQ8w -DQYDVQQKEwZHb29nbGUxEDAOBgNVBAsTB0FuZHJvaWQxGDAWBgNVBAMTD3d3dy5l -eGFtcGxlLmNvbTEiMCAGCSqGSIb3DQEJARYTZGNhc2htYW5AZ29vZ2xlLmNvbTBc -MA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaDdTbIKn9FeAv22zfMKPDtl/0uQ++vuTG -/ZpSLB5FE1E2xwjZPi8RyFGC5vPWGz/cyJq1dG1By1AGVMqDFAojAgMBAAEwDQYJ -KoZIhvcNAQEFBQADQQCPTVDKxVZpxFH6Nm7sxpRplLzxbs/xyGELLIjEBVrgB0CM -HAxFpPRHDSFpTxGG2mBCSrf+lD2Bf+WiIojx+RLY +MIIC+TCCAeGgAwIBAgIJALuyfpZeCDiwMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV +BAMMCGtleXNldF9BMB4XDTE1MTIwMjIxMTEzNFoXDTQzMDQxOTIxMTEzNFowEzER +MA8GA1UEAwwIa2V5c2V0X0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCwyk22F07G53uug8NkwyiY6peAkl1F8hamQoSqYLrUy/41/pBjdOisTAl6CGNK +aqPshsEqu299CrgTZck7Ue6ymZA7g2DaC+f6v7oTA18pz2Tnl3qz7btJHzruMq6s +Fsc21kwb62MvXIfiv603Ny4kKyDIAWoubEV1zETDM29ETJGmhhzlENHSaZPCQwJS +EnoIh3URgQqIIR03PG/59Y8RvbW778xamV4YIguzySCVFVvar9Y7MAC8avgVjmmV +9oTo36Wvv5SxyFD5oyLX66p7CjajSo8VWZk/mGfCPnkrhQzO782GEOpBCxfhxIYR +LUqAejkxOpGpmM38jt6bDmkVAgMBAAGjUDBOMB0GA1UdDgQWBBTVcIVD9u9538W/ +NE2Y36YiPtYmPzAfBgNVHSMEGDAWgBTVcIVD9u9538W/NE2Y36YiPtYmPzAMBgNV +HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjTN3mgaKep55wR1ULf4ULIc/m +mjfZK7ZnJcynBEIGyjAqt4mMIfKRV/DllLsf997r7bz12qUSLbhWGFSq4a2ceOIp +RG0+CGXV8Ez5Hz4o99MAP37Zdd5Lfq8fdlg2Mro2MMr21Tf3i2Y2LOfkXEZrW7rQ +A5ZRVksoRcPQWaaNA85LGRSCiC2XSjg8TLn1qKwQUXVGQ6fwLKqAeeV2+hynADih +FUaf7HxE5H3bHLByLmLKtab3Ta/g8VXxxRYuyd/rYsWMAHsjZge6xoVajm6Wvj5Q +AvIxV99+PK7dkjVpg3O2oN1O4DQlqqvxdhjNP733DI4cihfJYV9Vn+wKj3TA -----END CERTIFICATE----- diff --git a/core/tests/coretests/certs/keyset_B.pk8 b/core/tests/coretests/certs/keyset_B.pk8 index a44ebb3ffbfc7b159b5a68bdc655a32df0e747ee..839d96cb86226f5793094a19f605b43def069cd1 100644 GIT binary patch literal 138 zcmV;50CoQ`frkPC05B5<2P%e0&OHJF1_&yKNX|V20S5$aFlzz<0R$lC7!$O3&n*q5 zqVPW+HchYo=AI)~2o^w1_n_bzu0DFD*ma%a5vX7a$83X9fOfAtlt^fc4 literal 345 zcmV-f0jB;if&o&LNQUoKQMv;I|2a!0zm-8-$KSbQsv@a zYw-Ur)26=1qbI-%NyPue9g}u#62Drpu4<_L1?wEbBU8pyReo5tQNnJ8bRSZ*LrdgB zvOre?0|5X50ze_Xq0|?`onwxRF=C3t`)~ILA86`^S{(bImIhVpK%gCad4f*n>qenC zqKM!s)$`XAwm3_ake#po)b{*i1pxvf0PdCD0HO?KrL%TmQ9!2j+-(sOY7|D#Rj1yK z{OT?iGXfz1(>?TyxE|TUpVa!dV!J6l{jd3GQb1g@UgL=5!y_S00w7_E0WBsH-Di#D z0%Dbf>?}p5su`9lkk1