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

Commit 45cf33f2 authored by Sean Thomas's avatar Sean Thomas Committed by Sean Thomas (xWF)
Browse files

Relax restrictions on supported API levels 

For getDiceChainKind, allow older API levels to map to VSR 13

Bug: 379763239
Test: atest libkeymint_remote_prov_support_test
(cherry picked from https://android-review.googlesource.com/q/commit:0e79b69696807a5943ad559fc5dec7366029acf1)
Merged-In: Iecacb0adfb12ff8a1c4b633eb5668b429b091f04
Change-Id: Iecacb0adfb12ff8a1c4b633eb5668b429b091f04
Per OEM request, this topic is being cherry-picked.
parent 9bf75a33

security/keymint/support/remote_prov_utils.cpp

+8 −9
Original line number Diff line number Diff line
@@ -974,14 +974,13 @@ ErrMsgOr<bytevec> parseAndValidateAuthenticatedRequestSignedPayload( 


ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() {

    int vendor_api_level = ::android::base::GetIntProperty("ro.vendor.api_level", -1);

    switch (vendor_api_level) {

        case __ANDROID_API_T__:

    if (vendor_api_level <= __ANDROID_API_T__) {

        return hwtrust::DiceChain::Kind::kVsr13;

        case __ANDROID_API_U__:

    } else if (vendor_api_level == __ANDROID_API_U__) {

        return hwtrust::DiceChain::Kind::kVsr14;

        case 202404: /* TODO(b/315056516) Use a version macro for vendor API 24Q2 */

    } else if (vendor_api_level == 202404) {

        return hwtrust::DiceChain::Kind::kVsr15;

        default:

    } else {

        return "Unsupported vendor API level: " + std::to_string(vendor_api_level);

    }

}