From de3f8d9fd1e886a1f7ceec46e7b74a3845cac3c2 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@codeaurora.org>
Date: Wed, 22 Apr 2020 00:51:13 +0300
Subject: [PATCH] tests: Fix new fuzzer builds

$(LIBS) got included twice into the linker command line from $^ and
$(LIBS). The former ended up getting converted based on host CPU rather
than target. Fix that by removing duplication and -lcrypto from $(LIBS).

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 tests/fuzzing/dpp-uri/Makefile | 3 +--
 tests/fuzzing/sae/Makefile     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/fuzzing/dpp-uri/Makefile b/tests/fuzzing/dpp-uri/Makefile
index 27b2fddb3..10c4ea2f4 100644
--- a/tests/fuzzing/dpp-uri/Makefile
+++ b/tests/fuzzing/dpp-uri/Makefile
@@ -13,7 +13,6 @@ LIBS += $(SRC)/common/libcommon.a
 LIBS += $(SRC)/utils/libutils.a
 
 OBJS += $(SRC)/crypto/crypto_openssl.o
-LIBS += -lcrypto
 
 OBJS += $(SRC)/crypto/aes-ctr.o
 OBJS += $(SRC)/crypto/aes-siv.o
@@ -24,7 +23,7 @@ OBJS += $(SRC)/tls/asn1.o
 OBJS += $(SRC)/common/dpp.o
 
 dpp-uri: dpp-uri.o $(OBJS) $(LIBS)
-	$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
 
 clean:
 	$(MAKE) -C $(SRC) clean
diff --git a/tests/fuzzing/sae/Makefile b/tests/fuzzing/sae/Makefile
index 0a56e0628..5b86c2f43 100644
--- a/tests/fuzzing/sae/Makefile
+++ b/tests/fuzzing/sae/Makefile
@@ -8,14 +8,13 @@ LIBS += $(SRC)/common/libcommon.a
 LIBS += $(SRC)/utils/libutils.a
 
 OBJS += $(SRC)/crypto/crypto_openssl.o
-LIBS += -lcrypto
 OBJS += $(SRC)/crypto/dh_groups.o
 OBJS += $(SRC)/crypto/sha256-prf.o
 OBJS += $(SRC)/crypto/sha256-kdf.o
 OBJS += $(SRC)/common/dragonfly.o
 
 sae: sae.o $(OBJS) $(LIBS)
-	$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
 
 clean:
 	$(MAKE) -C $(SRC) clean