Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24a732cd authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keymint Support: Fix keymint_tags.h" am: 736d9351 am: 3686d220 am: 8c49bc61 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1566354

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27fbdcc6dcf21681f01f5be11677a83bd9470225
parents 033cc9a3 8c49bc61

security/keymint/support/include/keymint_support/keymint_tags.h

+3 −1
Original line number Diff line number Diff line
@@ -326,7 +326,9 @@ template <TagType tag_type, Tag tag> 
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);

}