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

Commit 6205b89f authored by tyiu's avatar tyiu Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c am: bc9a36a8 am: 3e2b0a15 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206



Change-Id: I393694db17a8885b98d2d1f52ebf87c05b597051
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4612c829 3e2b0a15

services/inputflinger/dispatcher/InputDispatcher.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <ftl/enum.h>

#include <ftl/enum.h>

#include <gui/SurfaceComposerClient.h>

#include <gui/SurfaceComposerClient.h>

#include <input/InputDevice.h>

#include <input/InputDevice.h>

#include <openssl/mem.h>

#include <powermanager/PowerManager.h>

#include <powermanager/PowerManager.h>

#include <unistd.h>

#include <unistd.h>

#include <utils/Trace.h>

#include <utils/Trace.h>
@@ -4454,7 +4455,7 @@ std::unique_ptr<VerifiedInputEvent> InputDispatcher::verifyInputEvent(const Inpu 
    if (calculatedHmac == INVALID_HMAC) {

    if (calculatedHmac == INVALID_HMAC) {

        return nullptr;

        return nullptr;

    }

    }

    if (calculatedHmac != event.getHmac()) {

    if (0 != CRYPTO_memcmp(calculatedHmac.data(), event.getHmac().data(), calculatedHmac.size())) {

        return nullptr;

        return nullptr;

    }

    }

    return result;

    return result;