| commit | 3686d22043ea06924596bbdf9d95bce3ebb3c408 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Mon Feb 01 16:42:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 01 16:42:52 2021 +0000 |
| tree | eb04db939f1d7be69953cb135d70b2eb3ebe87ce | |
| parent | 418ad80fee08d05896081b9cd0daf95bc1a289c6 [diff] | |
| parent | 736d9351574b2fddca8d56501d45d708ff4e9a93 [diff] |
Merge "Keymint Support: Fix keymint_tags.h" am: 736d935157 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1566354 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I200b84b3267971ce38e681b2f3de5db1b22d5e3b
diff --git a/security/keymint/support/include/keymint_support/keymint_tags.h b/security/keymint/support/include/keymint_support/keymint_tags.h index 8d2fe28..43cfb63 100644 --- a/security/keymint/support/include/keymint_support/keymint_tags.h +++ b/security/keymint/support/include/keymint_support/keymint_tags.h
@@ -326,7 +326,9 @@ inline std::optional< std::reference_wrapper<const typename TypedTag2ValueType<TypedTag<tag_type, tag>>::type>> authorizationValue(TypedTag<tag_type, tag> ttag, const KeyParameter& param) { - if (TypedTag2ValueType<TypedTag<tag_type, tag>>::unionTag != param.value.getTag()) return {}; + // We only check if the parameter has the correct tag here; accessTagValue checks if the correct + // union field was initialized. + if (tag != param.tag) return {}; return accessTagValue(ttag, param); }