From 91e4675508a2633a8c9d178912f40fd9b0adb299 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 5 Jan 2023 22:29:52 +0000 Subject: [PATCH] ANDROID: fips140: add crypto_memneq() back to the module crypto_memneq() is one of the utility functions that was intentionally included in the fips140 module, out of concerns that it would be seen as "cryptographic" and thus would be required to be included the module for the FIPS certification. It should not have been removed from the module, so add it back. Bug: 188620248 Fixes: 18cd39b70602 ("Merge tag 'android12-5.10.136_r00' into android12-5.10") Change-Id: I8a19dfd73390f8c1348885f97fa42d900e47b82b Signed-off-by: Eric Biggers --- crypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/Makefile b/crypto/Makefile index 2785e5fab9e7..8be22a6ea3d8 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -214,7 +214,7 @@ crypto-fips-objs := drbg.o ecb.o cbc.o ctr.o cts.o gcm.o xts.o hmac.o cmac.o \ gf128mul.o aes_generic.o lib-crypto-aes.o \ jitterentropy.o jitterentropy-kcapi.o \ sha1_generic.o sha256_generic.o sha512_generic.o \ - lib-sha1.o lib-crypto-sha256.o + lib-memneq.o lib-sha1.o lib-crypto-sha256.o crypto-fips-objs := $(foreach o,$(crypto-fips-objs),$(o:.o=-fips.o)) # get the arch to add its objects to $(crypto-fips-objs)