summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-04 23:20:36 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-04 23:20:36 +0000
commitb9f65028f95638c4158add21a01c537990d5ebc6 (patch)
tree307f0c942893b868c99c408671be180978e3fc73
parentc2c999bea610392c125acf0744f37c8b5e565039 (diff)
parentd294901e63fd57e884531a5dd7aea010770ec6f7 (diff)
downloadnative-b9f65028f95638c4158add21a01c537990d5ebc6.tar.gz
Snap for 9883365 from d294901e63fd57e884531a5dd7aea010770ec6f7 to tm-qpr3-release
Change-Id: I60cc9a8ec57623910408b374265674b966aca5ae
-rw-r--r--services/inputflinger/dispatcher/InputDispatcher.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 4ad9f42cdb..c6dd6217d3 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -27,6 +27,7 @@
#include <ftl/enum.h>
#include <gui/SurfaceComposerClient.h>
#include <input/InputDevice.h>
+#include <openssl/mem.h>
#include <powermanager/PowerManager.h>
#include <unistd.h>
#include <utils/Trace.h>
@@ -4433,7 +4434,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;