summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-28 23:01:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-28 23:01:52 +0000
commitb9f175aaab6da900e49549ebead47500b28bf438 (patch)
tree5eb6a0b527bb112f63558135826ca829ca77334d
parentb631df4b01dfd30fe79e55cae310f1a8847aff70 (diff)
parent82582195634d9339f2aa3db9cd77a2708db324f0 (diff)
downloadnative-b9f175aaab6da900e49549ebead47500b28bf438.tar.gz
Snap for 10035490 from 82582195634d9339f2aa3db9cd77a2708db324f0 to mainline-wifi-releaseaml_wif_331910020
Change-Id: I4142d870bacb819e5a427fec05dfca11f04a5683
-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 5e9427ad87..da461285f5 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>
@@ -4422,7 +4423,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;