Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev (b3191a4a) · Commits · e / os / android_frameworks_native

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>
	@@ -4422,7 +4423,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;