From 916c8c836fac1a794d865e18be403b4ff87fc40d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 13 Jul 2022 17:27:24 +0200 Subject: [PATCH] ANDROID: FIPS: remove memneq.o from the list of objects for the fips module Commit 795aa0cfd38d ("crypto: memneq - move into lib/") moved the memneq code out of crypto/ into lib/ which broke the building of the fips target. Resolve this by removing it from the explicit list of .o files to be linked as it will be picked up properly from lib/ Fixes: 795aa0cfd38d ("crypto: memneq - move into lib/") Cc: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman Change-Id: I9619db5fed8e68c8788d918138bd979cba157d51 --- crypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/Makefile b/crypto/Makefile index faf61838793d..f8ae18c54c11 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -212,7 +212,7 @@ UBSAN_SANITIZE_jitterentropy-fips.o = n # module that is in scope for FIPS 140-2 certification # crypto-fips-objs := drbg.o ecb.o cbc.o ctr.o cts.o gcm.o xts.o hmac.o cmac.o \ - memneq.o gf128mul.o aes_generic.o lib-crypto-aes.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