aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-30Snap for 10737070 from 5eee5ef21fee5c8ae1b2ba4494ce63162ed3ad09 to ↵aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000android14-mainline-resolv-releaseAndroid Build Coastguard Worker
mainline-resolv-release Change-Id: Iead76d98dddea5e5326ca856df89babb6da49382
2023-08-22Ignore MAC tests am: 7b6d5ebea1 am: b677e17249Prashant Patil
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24500007 Change-Id: I714391c3c9210d7022231c3fe87d11591146ea54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Ignore MAC tests am: 7b6d5ebea1Prashant Patil
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24500007 Change-Id: Ic168f45c34caec76a9cb94ecef85516d543ac5e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21Ignore MAC testsandroid-vts-14.0_r3android-vts-14.0_r2android-cts-14.0_r3android-cts-14.0_r2Prashant Patil
MacTest class have long running test which timed out on some slow processing devices. Disable these tests until concrete performance requirements can be specified. Bug: 296367623 Bug: 288588810 Bug: 292870100 Bug: 291706328 Bug: 289893151 Bug: 293261385 Bug: 296152445 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.MacTest (cherry picked from https://android-review.googlesource.com/q/commit:1924ded86d5a5d6c1cdc83f1facec9486086ee67) Merged-In: I88234a9cd72a6cecbe5f294a55d76579ef94a578 Change-Id: I88234a9cd72a6cecbe5f294a55d76579ef94a578
2023-08-11Ignore long MAC tests am: 27396c150f am: ce97881363Eran Messeri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24370376 Change-Id: I2af3cd7d96e12d60e803f4cc2881ffd7272bd228 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11Ignore long MAC tests am: 27396c150fEran Messeri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24370376 Change-Id: Ib3d6f2c3d3494599bbf404092aa4e8eb49cfb3fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09Ignore long MAC testsEran Messeri
Long MAC tests might take a long time to run because of slow processors or inefficiencies in some IPC layer. Disable these tests until concrete performance requirements can be specified. Bug: 288588810 Bug: 292870100 Bug: 291706328 Bug: 289893151 Bug: 293261385 Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.MacTest Change-Id: Iee54e00f924651b6f3fd8275d7a282037ba9f799 Merged-In: Iee54e00f924651b6f3fd8275d7a282037ba9f799
2023-08-03Snap for 10603417 from 8b45ed5019e871bc909ba7577e08e12eaba8f585 to ↵Android Build Coastguard Worker
mainline-resolv-release Change-Id: Idb22cf3a9d38f3d9b9cece43ca6941f33985fb1f
2023-08-03Avoid duplicate entry of digest am: d89919bab7 am: 4ae6fe0f13Prashant Patil
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24249204 Change-Id: I6126e2123740aeba6889f2fc409c1157edbc4e7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02Avoid duplicate entry of digest am: d89919bab7Prashant Patil
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24249204 Change-Id: Ibb41b67b991720e55896f6e9dc772ad99dcb60f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Avoid duplicate entry of digestPrashant Patil
While importing RSA-OAEP keys; main and mgf digest are set in same method and in some test vectors these are same. This could cause error in some KeyMint implementations. Hence unique digest parameters are passed. Bug: 277911910 Test: atest CtsKeystoreWycheproofTestCases:RsaOaepTest (cherry picked from https://android-review.googlesource.com/q/commit:a2eebd8d7197c4d11022fb45b7f9cbd59bb2f2f5) Merged-In: I77d69b1dc95c1c0f6fb078cddc648e9f307840bf Change-Id: I77d69b1dc95c1c0f6fb078cddc648e9f307840bf
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: I1fa26bb468465cabf8eb6e4640b120cebc0a6b9b 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: I2ad5a0d9bb862d4acd49a7ff151c5379b521b471 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-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: Ia65e636949b4cbd748531ad865c07676460d1ec2 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-07-07Snap for 10447354 from 2e04f8c5649563fe5846226db10a00285b680565 to ↵aml_res_340912000Android Build Coastguard Worker
mainline-resolv-release Change-Id: I89456186841d176fa114e1e06eb3738e75f06dfa
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: I016a646c880aa3505f6cdddce578a8da891c1915 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-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: Ifa5b924da5966a43b604d323a0c4e214e467dd51 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-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-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-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-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-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>