summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-05 14:13:02 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-05 14:13:02 +0000
commit9e1fcc39257a23ea5595cc1d9b30d874003266dc (patch)
tree5eb6a0b527bb112f63558135826ca829ca77334d
parent0f4c3a4f2f26a5ab8f545eef2cc7054de2b27dea (diff)
parent82582195634d9339f2aa3db9cd77a2708db324f0 (diff)
downloadnative-android13-mainline-adservices-release.tar.gz
Snap for 9887711 from 82582195634d9339f2aa3db9cd77a2708db324f0 to mainline-adservices-releaseaml_ads_331920180aml_ads_331814200android13-mainline-adservices-release
Change-Id: I461e5cc65d472d165198b71a40020b048b78ba47
-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;