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

Commit 1ca8e428 authored by Jing-yan, Jang's avatar Jing-yan, Jang Committed by Automerger Merge Worker
Browse files

Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" into rvc-dev am: 32cbc59c 

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

Change-Id: I5b6da6be2133860b752eb3a8d96a1e103f457352
parents d1c75f1d 32cbc59c

keymaster/4.0/support/keymaster_utils.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -121,8 +121,8 @@ void appendUint64(std::vector<uint8_t>& vec, uint64_t value) { 
uint64_t extractUint64(const std::vector<uint8_t>& data, size_t offset) {

uint64_t extractUint64(const std::vector<uint8_t>& data, size_t offset) {

    uint64_t value = 0;

    uint64_t value = 0;

    for (size_t n = 0; n < sizeof(uint64_t); n++) {

    for (size_t n = 0; n < sizeof(uint64_t); n++) {

        uint8_t byte = data[offset + n];

        uint64_t tmp = data[offset + n];

        value |= byte << (n * 8);

        value |= (tmp << (n * 8));

    }

    }

    return value;

    return value;

}

}
@@ -137,8 +137,8 @@ void appendUint32(std::vector<uint8_t>& vec, uint32_t value) { 
uint32_t extractUint32(const std::vector<uint8_t>& data, size_t offset) {

uint32_t extractUint32(const std::vector<uint8_t>& data, size_t offset) {

    uint32_t value = 0;

    uint32_t value = 0;

    for (size_t n = 0; n < sizeof(uint32_t); n++) {

    for (size_t n = 0; n < sizeof(uint32_t); n++) {

        uint8_t byte = data[offset + n];

        uint32_t tmp = data[offset + n];

        value |= byte << (n * 8);

        value |= (tmp << (n * 8));

    }

    }

    return value;

    return value;

}

}