From owner-svn-src-all@FreeBSD.ORG Sat Apr 28 11:01:13 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52738106564A; Sat, 28 Apr 2012 11:01:13 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CE558FC16; Sat, 28 Apr 2012 11:01:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3SB1D50057532; Sat, 28 Apr 2012 11:01:13 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3SB1DTQ057530; Sat, 28 Apr 2012 11:01:13 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201204281101.q3SB1DTQ057530@svn.freebsd.org> From: Bernhard Schmidt Date: Sat, 28 Apr 2012 11:01:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234757 - head/usr.sbin/wpa/wpa_supplicant X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Apr 2012 11:01:13 -0000 Author: bschmidt Date: Sat Apr 28 11:01:12 2012 New Revision: 234757 URL: http://svn.freebsd.org/changeset/base/234757 Log: enable EAP_GTC and EAP_OTP to match upstream's default configuration MFC after: 2 weeks Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile ============================================================================== --- head/usr.sbin/wpa/wpa_supplicant/Makefile Sat Apr 28 10:59:29 2012 (r234756) +++ head/usr.sbin/wpa/wpa_supplicant/Makefile Sat Apr 28 11:01:12 2012 (r234757) @@ -81,9 +81,11 @@ LDADD+=${WPA_SUPPLICANT_LDADD} .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) -CFLAGS+=-DEAP_LEAP \ +CFLAGS+=-DEAP_GTC \ + -DEAP_LEAP \ -DEAP_MD5 \ -DEAP_MSCHAPv2 \ + -DEAP_OTP \ -DEAP_PEAP \ -DEAP_PSK \ -DEAP_TLS \ @@ -96,10 +98,12 @@ SRCS+= chap.c \ crypto_openssl.c \ eap.c \ eap_common.c \ + eap_gtc.c \ eap_leap.c \ eap_md5.c \ eap_methods.c \ eap_mschapv2.c \ + eap_otp.c \ eap_peap.c \ eap_peap_common.c \ eap_psk.c \ @@ -112,14 +116,6 @@ SRCS+= chap.c \ mschapv2.c \ tls_openssl.c -.if !empty(CFLAGS:M*-DEAP_GTC) -SRCS+= eap_gtc.c -.endif - -.if !empty(CFLAGS:M*-DEAP_OTP) -SRCS+= eap_otp.c -.endif - .if !empty(CFLAGS:M*-DEAP_AKA) NEED_SIM_COMMON= true SRCS+= eap_aka.c