| commit | e003b0c518618a4bfb6c5c7a6024287ff2c51f7d | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Oct 29 07:06:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 29 07:06:01 2021 +0000 |
| tree | dd739d7a8300af5d45caf5cb757cfde75c9fcd32 | |
| parent | 4c46fb83b9730c560daf1a681430f65c7c67de24 [diff] | |
| parent | 612eacf7edcc0c57f8808fb5fe3359da569f4283 [diff] |
Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80 am: b7633b628a am: a00cd71e26 am: 612eacf7ed Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515 Change-Id: Idb8657ec174d66ab7efe28526bbc912d31f65556
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);