Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce51cc73 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

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

Merge "KeyMint: check missing EC_CURVE on v3+" into stage-aosp-udc-ts-dev am: a15d593c am: b74b27e0

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



Change-Id: Idf5c9b96ad2416656ab903e7291d97085893953a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be06219b b74b27e0

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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.