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

Commit 905fc416 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refactored keymaster4_utils_fuzzer" into main am: db1da1c8 

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



Change-Id: I45e9d9d50ece8164d35eee89bd881bc7a919d508
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1ce8cb4 db1da1c8

keymaster/4.0/support/fuzzer/keymaster4_utils_fuzzer.cpp

+35 −26
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ void KeyMaster4UtilsFuzzer::invokeKeyMasterUtils() { 
    support::getOsVersion();

    support::getOsPatchlevel();



    while (mFdp->remaining_bytes() > 0) {

        auto keymaster_function = mFdp->PickValueInArray<const std::function<void()>>({

                [&]() {

                    VerificationToken token;

                    token.challenge = mFdp->ConsumeIntegral<uint64_t>();

                    token.timestamp = mFdp->ConsumeIntegral<uint64_t>();
@@ -53,26 +56,32 @@ void KeyMaster4UtilsFuzzer::invokeKeyMasterUtils() { 
                    size_t vectorSize = mFdp->ConsumeIntegralInRange<size_t>(0, kMaxVectorSize);

                    token.mac.resize(vectorSize);

                    for (size_t n = 0; n < vectorSize; ++n) {

        token.mac[n] = n;

                        token.mac[n] = mFdp->ConsumeIntegral<uint8_t>();

                    }

    std::optional<std::vector<uint8_t>> serialized = serializeVerificationToken(token);

                    std::optional<std::vector<uint8_t>> serialized =

                            serializeVerificationToken(token);

                    if (serialized.has_value()) {

                        std::optional<VerificationToken> deserialized =

                                deserializeVerificationToken(serialized.value());

                    }



                },

                [&]() {

                    std::vector<uint8_t> dataVector;

                    size_t size = mFdp->ConsumeIntegralInRange<size_t>(0, sizeof(hw_auth_token_t));

                    dataVector = mFdp->ConsumeBytes<uint8_t>(size);

                    support::blob2hidlVec(dataVector.data(), dataVector.size());



                    support::blob2hidlVec(dataVector);



    std::string str = mFdp->ConsumeRandomLengthString(kMaxCharacters);

    support::blob2hidlVec(str);



                    HardwareAuthToken authToken = support::hidlVec2AuthToken(dataVector);

                    hidl_vec<uint8_t> volatile hidlVector = support::authToken2HidlVec(authToken);

                },

                [&]() {

                    std::string str = mFdp->ConsumeRandomLengthString(kMaxCharacters);

                    support::blob2hidlVec(str);

                },

        });

        keymaster_function();

    }

    return;

}



void KeyMaster4UtilsFuzzer::process(const uint8_t* data, size_t size) {