aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-27Snap for 10573380 from c3e87764ba8176d3eaec4dd7ab44ccc718f86cb5 to ↵android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseAndroid Build Coastguard Worker
udc-d1-release Change-Id: If0544dbf83a42c049f285e6eb9d3fa2371388bcb
2023-07-27Merge "Skipped non-default MGF_DIGEST for Keymint < V3" into ↵Treehugger Robot
stage-aosp-udc-ts-dev am: 4ab65073b0 am: 6a11d9cc9f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24149433 Change-Id: I460723e4720a0dba106b4e08d748571420a4c587 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Skipped non-default MGF_DIGEST for Keymint < V3" into ↵Treehugger Robot
stage-aosp-udc-ts-dev am: 4ab65073b0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24149433 Change-Id: I910b515daed2e1f485ddac22fe30c273aca638e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Changes made to skip the tests on devices with keyMaster in backend. am: ↵Rajesh Nyamagoud
5aaf3fd521 am: c0eaef4430 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24217382 Change-Id: I2c2fced3ba039e248e4c586a7af99b3736e5e1c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Skipped non-default MGF_DIGEST for Keymint < V3" into ↵Treehugger Robot
stage-aosp-udc-ts-dev
2023-07-27Changes made to skip the tests on devices with keyMaster in backend. am: ↵Rajesh Nyamagoud
5aaf3fd521 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24217382 Change-Id: Ied60352f107cdd97270960d271b3b3007c274701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Changes 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 Change-Id: I6fa0c6740e41bf24a5b9e737b611156f1a8d21c5
2023-07-20Skipped 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) Merged-In: I40fdfb14c244be83c19287289603644605e20e94 Change-Id: I40fdfb14c244be83c19287289603644605e20e94
2023-07-12Snap for 10486914 from ec69ce94f252f5ae561dc2fb1749c8822134cf4b to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Iad8cb01dfc9e4b320c3e2682f99c15a882f6f1e6
2023-07-12Add checks depending on whether the test is targetting strongbox or not am: ↵Hasini Gunasinghe
f25f780262 am: 5b0d15ca45 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24023904 Change-Id: I4748a68519758456276d75f637007c89639a0ce8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Add checks depending on whether the test is targetting strongbox or not am: ↵Hasini Gunasinghe
f25f780262 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24023904 Change-Id: I72df99f955d267ce5e711a325695b3ef9870b448 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add 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. Change-Id: I4c415ed995a4a3203c9f1aa15a7cdc2cd9b465cb Merged-In: I4c415ed995a4a3203c9f1aa15a7cdc2cd9b465cb
2023-03-31Snap for 9856111 from 5323a58891f133d7d817e5c018cef904be3727f2 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: If3330619c33d05f0f096bed641a796412e8912c0
2023-03-30Merge "Wycheproof: Correct a typo in bias ECDSA P256 StrongBox test." am: ↵Treehugger Robot
b5beb24a9a am: cd41732402 am: 2a6b2e796b am: 1484de2094 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2506316 Change-Id: I3a6eebc76abe4fa1a51a4ced61b315aad6d9b426 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: ↵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 9841731 from 9c8e9bb18552cc9508ab17d78f2e28920867d3b0 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I76831eeea688f9293c4a97f501681a0240bd1e91
2023-03-28Keystore:Filter out unexpected RSA key parameters am: 51d61afa63 am: ↵Prashant Patil
260247461c am: ac8bb6845a am: 008e2d489c Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2450522 Change-Id: I7c8abc5da9e30b174e66323afe1f62f08cd16ff7 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: ↵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 9520078 from 488f79d0da8fa8cc8a823d0aa8233596d63b6d05 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I7365cc9c07c6db36dae646b6e2556ee3e303a639
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 9467325 from 85e48ac1e3cb1a3f1e42c5da0b37a60b56cbf6b6 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I67d2907d7061b147266521faf35e2cfeda6223e5
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 9452568 from 7fe933965ec0d0f640f371b62576d3ebeea0d574 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I8d3ec2e98e3609169b311387f903b49d2134852c
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 9421497 from 23ee57bd8dfb56d2d52b3e671ec27ab8f66bd6c5 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I12eeff18bf84b57be90535e4e1f6927737bc6b70
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 9407086 from 55da3c72538b1d0263d89ff902bc319f242c75fd to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Icefd9f9dec92aaa50e308171490d0414aa23fcc3