From patchwork Thu Oct 15 10:13:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1382557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sipsolutions.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=0pcdQ543; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CBlWk2lncz9sTL for ; Thu, 15 Oct 2020 21:14:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=pGLIRlT5jDQNPVNBOaZU4EFkTu7wOfzRTqrwLy5LElU=; b=0pcdQ543sJaFdBRE90DaeTjOvu FLTcTt/Idsp4glZFIsorwqPW7wheGYLBmvUgC14HDxXEywmyECGPRLs3mwJyJahiTFVRRlyHHMmjZ DkM4/Gi3SnGjon1LVkI/VtduOROnCVGxzl4NmmJ8YTmIa3vfgB1DdD79RwsmzNuBbwFknLXN1PvWj jukdya1yIfFkLfoWRqUewsaU2iW6ZErMzqRUSnQgQ3JUYN0Re/Ex+dQy2hQkEUXMhHceZZVBYYjxZ WDLBRiGywpGr4DV+OgR2OIE9hkk4sDYpF6ZyOE4V5x0kkO5GYx7GnAGehSh9oKSTZJXB7Zlz/Ctgz A5h0TsIQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kT0GR-0005g1-Sx; Thu, 15 Oct 2020 10:13:39 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kT0GQ-0005fc-Hu for hostap@lists.infradead.org; Thu, 15 Oct 2020 10:13:39 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1kT0GK-006J0X-IT; Thu, 15 Oct 2020 12:13:32 +0200 From: Johannes Berg To: hostap@lists.infradead.org Subject: [PATCH] build: wpa_s: put common EAP objs into OBJS Date: Thu, 15 Oct 2020 12:13:26 +0200 Message-Id: <1602756806-I230fd2c6b47e826bad5193630073dcd66d0323c6@changeid> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201015_061338_668105_B167AB00 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.3 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Berg Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg Just building them (on disk) and not linking them anywhere doesn't seem like it would do the right thing, and fails after the rebuild since nothing knows how to build those .o files. Build them into the supplicant binary itself by adding them to OBJS so that they can be used by dynamically loaded EAP method. Signed-off-by: Johannes Berg --- wpa_supplicant/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 9adadf141e67..654af3ef39f2 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -646,12 +646,11 @@ ifdef CONFIG_EAP_FAST ifeq ($(CONFIG_EAP_FAST), dyn) CFLAGS += -DEAP_FAST_DYNAMIC EAPDYN += ../src/eap_peer/eap_fast.so -EAPDYN += ../src/eap_common/eap_fast_common.o else CFLAGS += -DEAP_FAST OBJS += ../src/eap_peer/eap_fast.o ../src/eap_peer/eap_fast_pac.o -OBJS += ../src/eap_common/eap_fast_common.o endif +OBJS += ../src/eap_common/eap_fast_common.o TLS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y NEED_T_PRF=y @@ -662,12 +661,11 @@ ifdef CONFIG_EAP_TEAP ifeq ($(CONFIG_EAP_TEAP), dyn) CFLAGS += -DEAP_TEAP_DYNAMIC EAPDYN += ../src/eap_peer/eap_teap.so -EAPDYN += ../src/eap_common/eap_teap_common.o else CFLAGS += -DEAP_TEAP OBJS += ../src/eap_peer/eap_teap.o ../src/eap_peer/eap_teap_pac.o -OBJS += ../src/eap_common/eap_teap_common.o endif +OBJS += ../src/eap_common/eap_teap_common.o TLS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y NEED_T_PRF=y @@ -811,12 +809,11 @@ ifdef CONFIG_EAP_IKEV2 ifeq ($(CONFIG_EAP_IKEV2), dyn) CFLAGS += -DEAP_IKEV2_DYNAMIC EAPDYN += ../src/eap_peer/eap_ikev2.so ../src/eap_peer/ikev2.o -EAPDYN += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o else CFLAGS += -DEAP_IKEV2 OBJS += ../src/eap_peer/eap_ikev2.o ../src/eap_peer/ikev2.o -OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o endif +OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o CONFIG_IEEE8021X_EAPOL=y NEED_DH_GROUPS=y NEED_DH_GROUPS_ALL=y