diff options
| author | David Drysdale <drysdale@google.com> | 2021-06-08 15:46:11 +0100 |
|---|---|---|
| committer | David Drysdale <drysdale@google.com> | 2021-06-18 13:52:47 +0100 |
| commit | df09e54ef31361c476ed58fce68dc3133f8bba99 (patch) | |
| tree | d48a9424345e93f84e3a99e437be40332ac35e63 /security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | |
| parent | 37af4b36569c915f7cf3a0e2f658f50814fe7498 (diff) | |
KeyMint VTS: require curve for ECDSA keys
The KeyMint AIDL spec requires that "Tag::EC_CURVE must be provided to
generate an ECDSA key". Move the VTS tests to always create ECDSA keys
by curve not key size.
Bug: 188672564
Test: VtsAidlKeyMintTargetTest
Change-Id: I33036387c243b21ab0ecd49221b7e7757598913e
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 5a511752b5..5359b3b667 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp @@ -1022,16 +1022,7 @@ vector<uint32_t> KeyMintAidlTestBase::ValidKeySizes(Algorithm algorithm) { } break; case Algorithm::EC: - switch (SecLevel()) { - case SecurityLevel::SOFTWARE: - case SecurityLevel::TRUSTED_ENVIRONMENT: - return {224, 256, 384, 521}; - case SecurityLevel::STRONGBOX: - return {256}; - default: - ADD_FAILURE() << "Invalid security level " << uint32_t(SecLevel()); - break; - } + ADD_FAILURE() << "EC keys must be specified by curve not size"; break; case Algorithm::AES: return {128, 256}; @@ -1147,9 +1138,11 @@ vector<EcCurve> KeyMintAidlTestBase::ValidCurves() { } vector<EcCurve> KeyMintAidlTestBase::InvalidCurves() { - if (SecLevel() == SecurityLevel::TRUSTED_ENVIRONMENT) return {}; - CHECK(SecLevel() == SecurityLevel::STRONGBOX); - return {EcCurve::P_224, EcCurve::P_384, EcCurve::P_521}; + if (SecLevel() == SecurityLevel::STRONGBOX) { + return {EcCurve::P_224, EcCurve::P_384, EcCurve::P_521}; + } else { + return {}; + } } vector<Digest> KeyMintAidlTestBase::ValidDigests(bool withNone, bool withMD5) { |