aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-28Merge cherrypicks of ['googleplex-android-review.googlesource.com/24023904', ↵android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/24217382', 'googleplex-android-review.googlesource.com/24149433'] into udc-release. Change-Id: I0c27bca6572f19ea2414d240ef3c300e2c7687bc
2023-07-28Skipped non-default MGF_DIGEST for Keymint < V3Prashant Patil
Although MGF_DIGEST is included in the KeyMint spec since V1, some implementations (notably the C++ reference implementation) did not correctly report its presence in key characteristics until V3. The framework layer decides whether to add the MGF_DIGEST tag to begin() parameters based on whether there are MGF_DIGEST values in the key characteristics. The situation above means that this check is only reliable for an underlying KeyMint implementation of v3 or above. Hence tests with non-default MGF_DIGEST are skipped for Keymint < V3. Bug: 289859292 Bug: 289749312 Bug: 287891167 Bug: 287532460 Bug: 290308127 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.RsaOaepTest Test: atest CtsKeystoreTestCases:android.keystore.cts.CipherTest#testKatBasicWithDifferentProviders (cherry picked from https://android-review.googlesource.com/q/commit:5c205f68b41024804da7b5dc3a19931ebdaa2760) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:72c483408533a87cc09aa8f055a9687a6ace1a9d) Merged-In: I40fdfb14c244be83c19287289603644605e20e94 Change-Id: I40fdfb14c244be83c19287289603644605e20e94
2023-07-28Changes made to skip the tests on devices with keyMaster in backend.Rajesh Nyamagoud
Few of the failing tests are updated to skip running if device is having TEE with KeyMaster implementation (basically anything below KeyMint v1). Ignore-AOSP-First: b/244609904#comment63 Test: atest CtsKeystoreWycheproofTestCases Bug: 244609904 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5aaf3fd5210ebd3fc139662689f9cfc96f0b8cd3) Merged-In: I6fa0c6740e41bf24a5b9e737b611156f1a8d21c5 Change-Id: I6fa0c6740e41bf24a5b9e737b611156f1a8d21c5
2023-07-28Add checks depending on whether the test is targetting strongbox or notHasini Gunasinghe
There may be devices which run Keymint in TEE but Keymaster 4.0 in Strongbox. Any test that sets the MGF digest to use anything other than SHA-1 should be skipped for Keymaster implementations. The devices that have different implementations in TEE and Strongbox need the check added in this CL. Bug: 288159720 Test: Should be tested on a device with aforementioend configuration. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f25f780262a441e5513125585e97aee5cccc124f) Merged-In: I4c415ed995a4a3203c9f1aa15a7cdc2cd9b465cb Change-Id: I4c415ed995a4a3203c9f1aa15a7cdc2cd9b465cb
2023-03-31Snap for 9853495 from 1484de2094c7bac97cd073ea790419b3ed9ba767 to udc-releaseandroid-security-14.0.0_r1Android Build Coastguard Worker
Change-Id: I7e656fa2470c38bf23d9c0bd2d7620383efbb98b
2023-03-30Merge "Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test." am: ↵android14-devTreehugger Robot
b5beb24a9a am: cd41732402 am: 2a6b2e796b Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2506316 Change-Id: I654f3f9d8bffb4042d555fd0282ac79e4f94b880 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test." am: ↵Treehugger Robot
b5beb24a9a am: cd41732402 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2506316 Change-Id: I4ab6d76c439a84281594bf323d32f1afed378269 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test." am: ↵Treehugger Robot
b5beb24a9a Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2506316 Change-Id: I1e1cfd7c22a06a3cdec3afdd02fe406b9acb526e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29Merge "Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test."android-u-beta-1-gplTreehugger Robot
2023-03-29Snap for 9839270 from 008e2d489cd4230a22f0119599bef79a87b6d064 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I6d121ed7c30a0089eac9a1eb877a54ac525497fb
2023-03-28Keystore:Filter out unexpected RSA key parameters am: 51d61afa63 am: ↵Prashant Patil
260247461c am: ac8bb6845a Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2450522 Change-Id: Iec8cfea9f60af526fd5b6eee50f50f1f2e3d22a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Keystore:Filter out unexpected RSA key parameters am: 51d61afa63 am: 260247461cPrashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2450522 Change-Id: Iff7ec61daaeca6205a6a7524955d6f436871db2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28Keystore:Filter out unexpected RSA key parameters am: 51d61afa63Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2450522 Change-Id: I6f2ba3f0a89c63103a1dc9704092264f38654cd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test.Lingyun Zhao
Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.EcdsaTest Change-Id: I76087d50300b5f108201df0234f8aa47cb05d104
2023-03-21Keystore:Filter out unexpected RSA key parametersPrashant Patil
Non expected KeySize and Digests are filtered from RsaOaepTest class. Bug: 229182999 Bug: 267261867 Bug: 268354992 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.RsaOaepTest Change-Id: I5da4e51d25368d1207125e4076e1c131d52008e0
2023-01-24Snap for 9519281 from 1eb08b78517841890c247a4e7cfd37d7292a9791 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I7614c92fbdda8cae6478f237b3ba6d98b47facb8
2023-01-23Keystore:Gson visibility to android-key-attestation am: e93c839d9f am: ↵Prashant Patil
a24305c53e am: 3ca01dba85 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2390521 Change-Id: I9ec25b9943d331333fc5de909fd92dc055d68d6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23Keystore:Gson visibility to android-key-attestation am: e93c839d9f am: ↵Prashant Patil
a24305c53e Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2390521 Change-Id: I95e9cceb307bad8481837dbead4ae2c250843f13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23Keystore:Gson visibility to android-key-attestation am: e93c839d9fPrashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2390521 Change-Id: I6bcf1310d391f9fc1269b34fb4f5892ee97ff5cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-17Keystore:Gson visibility to android-key-attestationmain-16k-with-phonesPrashant Patil
Added a visibility of Gson library to //external/android-key-attestation library. Bug: 200011803 Test: atest CtsKeystoreTestCases:android.keystore.cts.DeviceOwnerKeyManagementTest Change-Id: I2ad9f6964cec88978431d7fb0d8aac7eb439444b
2023-01-09Snap for 9467145 from a42228efc6012441f75714bf0db1bf493ed93161 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ie21347ceef6430b660be91decf2ac77bc38b61e7
2023-01-07Keystore:Assumption for non default MGF digest. am: c9c8b81a1a am: ↵Prashant Patil
8801bdbf40 am: 2a67b1cf2e Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358819 Change-Id: Ied6422da6f356575a96ee49427abe9bcef8a8886 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07Keystore:Assumption for non default MGF digest. am: c9c8b81a1a am: 8801bdbf40Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358819 Change-Id: Ib20e98e4626f140dc51a30fc449f417d44d66df1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07Keystore:Assumption for non default MGF digest. am: c9c8b81a1aPrashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358819 Change-Id: I8dcae796cb8a2b7ecca7c6eb101521f6e335d1bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05Keystore:Assumption for non default MGF digest.Prashant Patil
Support for RSA-OAEP with MGF digest other than SHA1 is added from KeyMint V1. For older versions this feature is expected to be added in Software emulation (b/216436980). Until software emulation is implemented for non-default MGF Digest, the test should be skipped. Test cases which are using MGF digest other than SHA1 are skipped by adding the assumption that the underlying Key{Master/Mint} implementation is greater than or equal to KeyMint V1. But there are few test vectors failing, which are already reported in b/258005962 and b/258389371 and those are implementation issues in KeyMaster and KeyMint of respective devices. Bug: 262370514 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.RsaOaepTest Change-Id: I119651788ca1bb5d1a626db0238b4e3631cf8f79
2023-01-04Snap for 9451931 from 5397bfcb4903e8ee6fbfa1011b75709df4a0107c to udc-releaseAndroid Build Coastguard Worker
Change-Id: I7cf406e3cb5ca8f6bea39718efa761964a2d34a5
2023-01-03Keystore: StrongBox assumption added in EcdsaTest am: 0cbbf85345 am: ↵Prashant Patil
9cbb4bb889 am: 374e2aef22 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2361485 Change-Id: I7d91ece3f91bfe14de6b805a859deedfe2cf65c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Keystore: StrongBox assumption added in EcdsaTest am: 0cbbf85345 am: 9cbb4bb889Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2361485 Change-Id: Iff02d9c04097fcc9f80cf99e8163ffabdad127ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Keystore: StrongBox assumption added in EcdsaTest am: 0cbbf85345Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2361485 Change-Id: Icb44fce5d248e3e04ba44471ea9a9601562487c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Keystore: StrongBox assumption added in EcdsaTestPrashant Patil
Test EcdsaTest#testNullRandomSecp256r1_StrongBox is assumed to run against StrongBox. Bug: 263084189 Test: atest CtsKeystoreWycheproofTestCases: com.google.security.wycheproof.EcdsaTest#testNullRandomSecp256r1_StrongBox Change-Id: I3b117f31303008a3f44ff4f3e04a7371786b36e1
2022-12-20Snap for 9420774 from 38490d55e81fe9382fa9413d5a91ed23d8d12359 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I5214e94d02f1558ca0471347d65be68cbd78eab7
2022-12-19Keystore: Added missing assumption statement am: 82033fa109 am: 7c243c7cf1 ↵Prashant Patil
am: dea239ad0a Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358820 Change-Id: If614a1fc3bf854f1f56a58e3a33ee8de893508bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19Keystore: Added missing assumption statement am: 82033fa109 am: 7c243c7cf1Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358820 Change-Id: I18935f3ce198320653aa5edfced8b0d4aa203e03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19Keystore: Added missing assumption statement am: 82033fa109Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2358820 Change-Id: I17ee56ad999bfdcc4f9c0a1b894818203eea1f6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Keystore: Added missing assumption statementPrashant Patil
A missing statement of assumption of strongbox is added in RsaOaepTest#testRsaOaep2048Sha1Mgf1Sha1_StrongBox test. Bug: 262706454 Test: atest CtsKeystoreWycheproofTestCases: com.google.security.wycheproof.RsaOaepTest#testRsaOaep2048Sha1Mgf1Sha1_StrongBox Change-Id: I0d24514b7d60394ef5212017e71dcaa5096be06d
2022-12-15Snap for 9406101 from abe6b210c57b090bcc8c7a18ec09b20697f1490a to udc-releaseAndroid Build Coastguard Worker
Change-Id: I8d15e64f9f2034dc108fd932e3ca1c353a45f425
2022-12-14Merge "Wycheproof: Upstream changes for EcdsaTest" am: 65dde432f1 am: ↵Eran Messeri
dc3980b295 am: 2eb222fa30 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2319277 Change-Id: I87739c72e3c90a9f58afa34123933be55579e733 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14Merge "Wycheproof: Upstream changes for EcdsaTest" am: 65dde432f1 am: dc3980b295Eran Messeri
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2319277 Change-Id: I09f9d896cc0ec7889ecb657b6707f1e8d7faebbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14Merge "Wycheproof: Upstream changes for EcdsaTest" am: 65dde432f1Eran Messeri
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2319277 Change-Id: I7d47f291240dcbdc3c72e9c8ac269aad21572266 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14Merge "Wycheproof: Upstream changes for EcdsaTest"Eran Messeri
2022-12-07Wycheproof: Upstream changes for EcdsaTestPrashant Patil
Upstream changes from Wycheproof project with support for AndroidKeystore provider and keys. The message from Upstream CL as follows - "Changing EcdsaTest, so that it works with deterministic ECDSA. Adding a test that checks the behaviour of ECDSA when null is passed as SecureRandom argument. If the implementation is randomized otherwise then we still expect randomized signatures. If the implementation is deterministic, we just expect this to work and not throw a NullPointerException. Testing: I'm testing this against openjdk and BouncyCastle. BouncyCastle has a deterministic implementation of ECDSA, which is called ECDDSA. Providers that don't know ECDDSA (which is every provider except BouncyCastle just skip the test)." Bug: 258011138 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.EcdsaTest Change-Id: I1c03b8e14b9a7cd8055ef470c9558bbc30108958
2022-11-27Snap for 9336400 from 32426d11ca83fcbd6738dedac42a9dd0fbbe4e45 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I13a9147e7f3c42b8e8d8eb7466ef8a239c5b01e3
2022-11-25Merge "Corrected expected key size for strongbox" am: eed8c8418c am: ↵Eran Messeri
b54f49671c am: 1f6bddb4aa Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2306315 Change-Id: I38baf61268384e38dcbe4e0595889de7b1ae5ad8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Removed assumption after software emulation support am: 52862ce682 am: ↵Prashant Patil
0a89faefb2 am: 94446b3aaa Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2309226 Change-Id: Ic54808116105dd199d3cc8baad2cc7fd069a57c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Merge "Corrected expected key size for strongbox" am: eed8c8418c am: b54f49671cEran Messeri
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2306315 Change-Id: If58b5cd463e45e8ea158ab8c3817855d32fb1605 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Removed assumption after software emulation support am: 52862ce682 am: ↵Prashant Patil
0a89faefb2 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2309226 Change-Id: I6c7365e8c5051ca4721e318fd8afe5974f452004 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Merge "Corrected expected key size for strongbox" am: eed8c8418cEran Messeri
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2306315 Change-Id: I237a62a707dfcd5554f2bf5cb31dab4ed8629ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Removed assumption after software emulation support am: 52862ce682Prashant Patil
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2309226 Change-Id: Id94199fb073f6872787b5801733425958d1b0f95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25Merge "Corrected expected key size for strongbox"Eran Messeri
2022-11-18Removed assumption after software emulation supportPrashant Patil
Removed assumption made in EcdhTest#testNistCurveLargePrivateKey test after AGREE_KEY import supported for Keymaster. https://android-review.git.corp.google.com/c/platform/system/security/+/2285253 Bug: 259550942 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.EcdhTest Change-Id: Ie8746ea8cdbb08459a99c95122aa86fe83566304
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 16:03:48 +0000