| commit | 8c49bc611e816da8eb1f2b24ba1766b4a0c02765 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Mon Feb 01 17:10:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 01 17:10:17 2021 +0000 |
| tree | a42bbb1fa44ffd0128ba0a4813ce8d7bd09fece6 | |
| parent | d5200fcdbae5e0a3c812a6f73448c607b19f5dbf [diff] | |
| parent | 3686d22043ea06924596bbdf9d95bce3ebb3c408 [diff] |
Merge "Keymint Support: Fix keymint_tags.h" am: 736d935157 am: 3686d22043 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1566354 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If43ffc4efff55dbbe0abc2bcdef0b79abcf0d0d4
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); }