diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-25 03:31:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-25 03:31:08 +0000 |
commit | dcebe413e6ee44a0c2c21e97429e8e0cc4bc2dbc (patch) | |
tree | dad2e4348cf7f1c599fc02b1687ea57b44b15f12 /security/keymint/aidl/default/RemotelyProvisionedComponent.cpp | |
parent | 37a59e400f32e5f41e10b5f0210d393dd0eaa2e3 (diff) | |
parent | 8bfd260e3e14bcece839d41c2fcf52faeb05d1ca (diff) |
Merge "Fixing VTS tests after IKeyMint breakage" am: 8bfd260e3e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1598499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54b5febee377618a5a8a4bbe23d040e17a402813
Diffstat (limited to 'security/keymint/aidl/default/RemotelyProvisionedComponent.cpp')
-rw-r--r-- | security/keymint/aidl/default/RemotelyProvisionedComponent.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/keymint/aidl/default/RemotelyProvisionedComponent.cpp b/security/keymint/aidl/default/RemotelyProvisionedComponent.cpp index f2651fbce7..2373b2682b 100644 --- a/security/keymint/aidl/default/RemotelyProvisionedComponent.cpp +++ b/security/keymint/aidl/default/RemotelyProvisionedComponent.cpp @@ -259,8 +259,9 @@ cppbor::Array buildCertReqRecipients(const bytevec& pubkey, const bytevec& kid) } static keymaster_key_param_t kKeyMintEcdsaP256Params[] = { - Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN), Authorization(TAG_ALGORITHM, KM_ALGORITHM_EC), - Authorization(TAG_KEY_SIZE, 256), Authorization(TAG_DIGEST, KM_DIGEST_SHA_2_256), + Authorization(TAG_PURPOSE, KM_PURPOSE_ATTEST_KEY), + Authorization(TAG_ALGORITHM, KM_ALGORITHM_EC), Authorization(TAG_KEY_SIZE, 256), + Authorization(TAG_DIGEST, KM_DIGEST_SHA_2_256), Authorization(TAG_EC_CURVE, KM_EC_CURVE_P_256), Authorization(TAG_NO_AUTH_REQUIRED), // The certificate generated by KM will be discarded, these values don't matter. Authorization(TAG_CERTIFICATE_NOT_BEFORE, 0), Authorization(TAG_CERTIFICATE_NOT_AFTER, 0)}; |