Merge "KeyMint: check missing EC_CURVE on v3+" into stage-aosp-udc-ts-dev am: a15d593ccd am: b74b27e0de am: ce51cc7326

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24771013

Change-Id: Ie6843afd889229583f0dfde7aedc32c4eb8d4606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale
2023-09-20 13:57:42 +00:00
committed by Automerger Merge Worker

View File

@@ -2630,16 +2630,16 @@ TEST_P(NewKeyGenerationTest, EcdsaInvalidCurve) {
/*
* NewKeyGenerationTest.EcdsaMissingCurve
*
* Verifies that EC key generation fails if EC_CURVE not specified after KeyMint V2.
* Verifies that EC key generation fails if EC_CURVE not specified after KeyMint V3.
*/
TEST_P(NewKeyGenerationTest, EcdsaMissingCurve) {
if (AidlVersion() < 2) {
if (AidlVersion() < 3) {
/*
* The KeyMint V1 spec required that EC_CURVE be specified for EC keys.
* However, this was not checked at the time so we can only be strict about checking this
* for implementations of KeyMint version 2 and above.
* for implementations of KeyMint version 3 and above.
*/
GTEST_SKIP() << "Requiring EC_CURVE only strict since KeyMint v2";
GTEST_SKIP() << "Requiring EC_CURVE only strict since KeyMint v3";
}
/* If EC_CURVE not provided, generateKey
* must return ErrorCode::UNSUPPORTED_KEY_SIZE or ErrorCode::UNSUPPORTED_EC_CURVE.