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

Commit 7d038517 authored by Timothy Yiu's avatar Timothy Yiu Committed by Automerger Merge Worker
Browse files

Merge "Fix HMAC Compare time attack" into udc-dev am: a93641a8 

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



Change-Id: Ic8b7fe6f88daf8078275f1bffb042a60ce05c6d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f05615c a93641a8

services/inputflinger/dispatcher/InputDispatcher.cpp

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#endif

#include <input/InputDevice.h>

#include <input/PrintTools.h>

#include <openssl/mem.h>

#include <powermanager/PowerManager.h>

#include <unistd.h>

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

        return nullptr;

    }

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

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

        return nullptr;

    }

    return result;