diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-29 01:31:34 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-29 01:31:34 +0000 |
commit | ae915d1dbb1d2b3ca77da7fd1839b9713ba56465 (patch) | |
tree | 6a971dfc398140179e9415b7aa678ce4abc1f444 | |
parent | b74cf6cb19ba3a13ea16f1c6825ee70251277094 (diff) | |
parent | cd75702d20b2fd7c02242d747d3f613e57e780cd (diff) | |
download | keymaster-ae915d1dbb1d2b3ca77da7fd1839b9713ba56465.tar.gz |
Snap for 10036481 from cd75702d20b2fd7c02242d747d3f613e57e780cd to udc-d1-release
Change-Id: Id2f180c458ca05f5b9e8f5d0aee86e6a8b923320
-rw-r--r-- | ng/KeyMintUtils.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ng/KeyMintUtils.cpp b/ng/KeyMintUtils.cpp index 98763fd..0d9c324 100644 --- a/ng/KeyMintUtils.cpp +++ b/ng/KeyMintUtils.cpp @@ -39,12 +39,6 @@ KeyParameter kmEnumParam2Aidl(const keymaster_key_param_t& param) { case KM_TAG_DIGEST: return KeyParameter{Tag::DIGEST, KeyParameterValue::make<KeyParameterValue::digest>( static_cast<Digest>(param.enumerated))}; - - case KM_TAG_RSA_OAEP_MGF_DIGEST: - return KeyParameter{Tag::RSA_OAEP_MGF_DIGEST, - KeyParameterValue::make<KeyParameterValue::digest>( - static_cast<Digest>(param.enumerated))}; - case KM_TAG_PADDING: return KeyParameter{Tag::PADDING, KeyParameterValue::make<KeyParameterValue::paddingMode>( static_cast<PaddingMode>(param.enumerated))}; @@ -58,17 +52,10 @@ KeyParameter kmEnumParam2Aidl(const keymaster_key_param_t& param) { case KM_TAG_ORIGIN: return KeyParameter{Tag::ORIGIN, KeyParameterValue::make<KeyParameterValue::origin>( static_cast<KeyOrigin>(param.enumerated))}; - case KM_TAG_BLOB_USAGE_REQUIREMENTS: case KM_TAG_KDF: - return KeyParameter{Tag::INVALID, false}; - default: - // Unknown tag. We can't represent it properly because it's some unknown enum. But KeyMint - // specs require us to return unknown tags. Pretending it's an integer value is the best we - // can do. Upstream will have to deal with it. - return KeyParameter{static_cast<Tag>(param.tag), - KeyParameterValue::make<KeyParameterValue::integer>(param.enumerated)}; + return KeyParameter{Tag::INVALID, false}; } } @@ -103,11 +90,9 @@ keymaster_key_param_t aidlEnumParam2Km(const KeyParameter& param) { return aidlEnumVal2Km<KeyParameterValue::origin>(tag, param.value); case KM_TAG_BLOB_USAGE_REQUIREMENTS: case KM_TAG_KDF: - CHECK(false) << "Unused enum tag: Something is broken"; - return keymaster_param_enum(KM_TAG_INVALID, false); default: - // Unknown tag. This can happen when system is newer than secure world. Pass it through. - return keymaster_param_enum(tag, param.value.get<KeyParameterValue::integer>()); + CHECK(false) << "Unknown or unused enum tag: Something is broken"; + return keymaster_param_enum(tag, false); } } @@ -144,6 +129,7 @@ KeyParameter kmParam2Aidl(const keymaster_key_param_t& param) { case KM_ENUM: case KM_ENUM_REP: return kmEnumParam2Aidl(param); + break; case KM_UINT: case KM_UINT_REP: @@ -154,23 +140,28 @@ KeyParameter kmParam2Aidl(const keymaster_key_param_t& param) { case KM_ULONG_REP: return KeyParameter{ tag, KeyParameterValue::make<KeyParameterValue::longInteger>(param.long_integer)}; + break; case KM_DATE: return KeyParameter{tag, KeyParameterValue::make<KeyParameterValue::dateTime>(param.date_time)}; + break; case KM_BOOL: return KeyParameter{tag, param.boolean}; + break; case KM_BIGNUM: case KM_BYTES: return {tag, KeyParameterValue::make<KeyParameterValue::blob>( std::vector(param.blob.data, param.blob.data + param.blob.data_length))}; + break; case KM_INVALID: default: CHECK(false) << "Unknown or unused tag type: Something is broken"; return KeyParameter{Tag::INVALID, false}; + break; } } |