commit | 0e3027ab80ce7a5c1cc417f57377bb7e18701c0b | [log] [tgz] |
---|---|---|
author | David Drysdale <drysdale@google.com> | Fri Oct 29 06:12:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 29 06:12:38 2021 +0000 |
tree | ad969ccc1c3c75bd7fe448e2b18d7d62a60de359 | |
parent | 8fe0dacf4f239fbfaedbda9c2e64e56d31f6cf30 [diff] | |
parent | 153bbc9cc598e9b0d168765d60144a54b14f582e [diff] |
Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515 Change-Id: If9f70170cf065013e39a1439ff1f5b85715f4dac
diff --git a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp index 38f3586..76fb79b 100644 --- a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp +++ b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -222,7 +222,7 @@ // Generate an ECDSA key that is attested by the generated P256 keypair. AuthorizationSet keyDesc = AuthorizationSetBuilder() .Authorization(TAG_NO_AUTH_REQUIRED) - .EcdsaSigningKey(256) + .EcdsaSigningKey(EcCurve::P_256) .AttestationChallenge("foo") .AttestationApplicationId("bar") .Digest(Digest::NONE)
diff --git a/security/keymint/support/authorization_set.cpp b/security/keymint/support/authorization_set.cpp index 25eace3..c1b5d48 100644 --- a/security/keymint/support/authorization_set.cpp +++ b/security/keymint/support/authorization_set.cpp
@@ -161,11 +161,6 @@ return EncryptionKey(); } -AuthorizationSetBuilder& AuthorizationSetBuilder::EcdsaSigningKey(uint32_t key_size) { - EcdsaKey(key_size); - return SigningKey(); -} - AuthorizationSetBuilder& AuthorizationSetBuilder::EcdsaSigningKey(EcCurve curve) { EcdsaKey(curve); return SigningKey();
diff --git a/security/keymint/support/include/keymint_support/authorization_set.h b/security/keymint/support/include/keymint_support/authorization_set.h index ca51b08..e41a329 100644 --- a/security/keymint/support/include/keymint_support/authorization_set.h +++ b/security/keymint/support/include/keymint_support/authorization_set.h
@@ -281,7 +281,6 @@ AuthorizationSetBuilder& RsaSigningKey(uint32_t key_size, uint64_t public_exponent); AuthorizationSetBuilder& RsaEncryptionKey(uint32_t key_size, uint64_t public_exponent); - AuthorizationSetBuilder& EcdsaSigningKey(uint32_t key_size); AuthorizationSetBuilder& EcdsaSigningKey(EcCurve curve); AuthorizationSetBuilder& AesEncryptionKey(uint32_t key_size); AuthorizationSetBuilder& TripleDesEncryptionKey(uint32_t key_size);