Date: Thu, 26 Apr 2012 23:51:34 +0200 From: =?ISO-8859-1?Q?Ermal_Lu=E7i?= <eri@freebsd.org> To: Bernhard Schmidt <bschmidt@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r234711 - in head/usr.sbin/wpa: . hostapd Message-ID: <CAPBZQG1W-5wE01%2BETXCds5f_8bVPNXOpqgercGJz9Kf-EL28uQ@mail.gmail.com> In-Reply-To: <201204261735.q3QHZCH4060106@svn.freebsd.org> References: <201204261735.q3QHZCH4060106@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks, i actually forgot to submit this. On Thu, Apr 26, 2012 at 7:35 PM, Bernhard Schmidt <bschmidt@freebsd.org> wr= ote: > Author: bschmidt > Date: Thu Apr 26 17:35:11 2012 > New Revision: 234711 > URL: http://svn.freebsd.org/changeset/base/234711 > > Log: > =A0fix EAP server support after the 0.7.3 import: > =A0- eap_xxx.c files have been renamed to eap_server_xxx.c > =A0- additional crypto files are required for some options > =A0- EAP_MD5 and EAP_GTC is now enabled by default to match vendor config > =A0- move each file on its own line to hopefully make further diffs easie= r > =A0 =A0to read > > =A0EAP_SERVER is now enabled by default. Fiddling with HOSTAPD_CFLAGS in > =A0src.conf is no longer required to get a basic WPA-EAP/radius setup > =A0running. > > =A0Tested by: =A0 =A0Johann Hugo <jhugo at meraka.csir.co.za> > =A0MFC after: =A0 =A02 weeks > > Modified: > =A0head/usr.sbin/wpa/Makefile.inc > =A0head/usr.sbin/wpa/hostapd/Makefile > > Modified: head/usr.sbin/wpa/Makefile.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/wpa/Makefile.inc =A0 =A0 =A0Thu Apr 26 14:51:12 2012 = =A0 =A0 =A0 =A0(r234710) > +++ head/usr.sbin/wpa/Makefile.inc =A0 =A0 =A0Thu Apr 26 17:35:11 2012 = =A0 =A0 =A0 =A0(r234711) > @@ -7,17 +7,23 @@ WPA_SUPPLICANT_DISTDIR?=3D${WPA_DISTDIR}/w > =A0HOSTAPD_DISTDIR?=3D =A0 =A0 =A0${WPA_DISTDIR}/hostapd > > =A0.PATH.c:${.CURDIR}/.. \ > + =A0 =A0 =A0 ${WPA_DISTDIR}/src/ap \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/common \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/crypto \ > + =A0 =A0 =A0 ${WPA_DISTDIR}/src/eapol_auth \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/eap_common \ > + =A0 =A0 =A0 ${WPA_DISTDIR}/src/eap_server \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/eapol_supp \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/l2_packet \ > + =A0 =A0 =A0 ${WPA_DISTDIR}/src/radius \ > =A0 =A0 =A0 =A0${WPA_DISTDIR}/src/utils > > =A0CFLAGS+=3D-I${.CURDIR} > +CFLAGS+=3D-I${HOSTAPD_DISTDIR} > =A0CFLAGS+=3D-I${WPA_DISTDIR}/src > =A0CFLAGS+=3D-I${WPA_DISTDIR}/src/common > =A0CFLAGS+=3D-I${WPA_DISTDIR}/src/crypto > +CFLAGS+=3D-I${WPA_DISTDIR}/src/drivers > =A0CFLAGS+=3D-I${WPA_DISTDIR}/src/l2_packet > =A0CFLAGS+=3D-I${WPA_DISTDIR}/src/utils > > > Modified: head/usr.sbin/wpa/hostapd/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/wpa/hostapd/Makefile =A0Thu Apr 26 14:51:12 2012 =A0 = =A0 =A0 =A0(r234710) > +++ head/usr.sbin/wpa/hostapd/Makefile =A0Thu Apr 26 17:35:11 2012 =A0 = =A0 =A0 =A0(r234711) > @@ -2,33 +2,59 @@ > > =A0.include "${.CURDIR}/../Makefile.inc" > > -.PATH.c:${HOSTAPD_DISTDIR} \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/ap \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/eap_server \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/eap_common \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/eapol_auth \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/drivers \ > - =A0 =A0 =A0 ${WPA_DISTDIR}/src/radius \ > - =A0 =A0 =A0 ${WPA_DISTDIR} > +.PATH.c:${WPA_DISTDIR}/src/drivers > > =A0PROG=3D =A0hostapd > -SRCS=3D =A0accounting.c aes-wrap.c ap_config.c \ > - =A0 =A0 =A0 ap_drv_ops.c ap_mlme.c authsrv.c \ > - =A0 =A0 =A0 chap.c common.c config_file.c ctrl_iface.c crypto_openssl.c= \ > - =A0 =A0 =A0 ctrl_iface_ap.c drivers.c drv_callbacks.c dump_state.c \ > - =A0 =A0 =A0 eap_common.c eap_peap_common.c eap_register.c eap_server.c = \ > - =A0 =A0 =A0 eap_server_gtc.c eap_server_identity.c eap_server_md5.c \ > - =A0 =A0 =A0 eap_server_methods.c eap_server_mschapv2.c eap_server_peap.= c \ > - =A0 =A0 =A0 eap_server_tls.c eap_server_tls_common.c eap_server_ttls.c = \ > - =A0 =A0 =A0 eapol_auth_dump.c eapol_auth_sm.c eloop.c hostapd.c ieee802= _11_auth.c \ > - =A0 =A0 =A0 ieee802_11_common.c ieee802_11_ht.c ieee802_1x.c ip_addr.c = \ > - =A0 =A0 =A0 md5.c main.c ms_funcs.c peerkey_auth.c pmksa_cache_auth.c \ > - =A0 =A0 =A0 preauth_auth.c radius.c radius_client.c sta_info.c \ > - =A0 =A0 =A0 sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c \ > - =A0 =A0 =A0 tkip_countermeasures.c utils.c \ > - =A0 =A0 =A0 vlan_init.c wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_co= mmon.c \ > - =A0 =A0 =A0 wpa_debug.c wpabuf.c > -SRCS+=3D l2_packet_freebsd.c driver_freebsd.c os_unix.c > +SRCS=3D =A0accounting.c \ > + =A0 =A0 =A0 aes-wrap.c \ > + =A0 =A0 =A0 ap_config.c \ > + =A0 =A0 =A0 ap_drv_ops.c \ > + =A0 =A0 =A0 ap_mlme.c \ > + =A0 =A0 =A0 authsrv.c \ > + =A0 =A0 =A0 chap.c \ > + =A0 =A0 =A0 common.c \ > + =A0 =A0 =A0 config_file.c \ > + =A0 =A0 =A0 crypto_openssl.c \ > + =A0 =A0 =A0 ctrl_iface.c \ > + =A0 =A0 =A0 ctrl_iface_ap.c \ > + =A0 =A0 =A0 drivers.c \ > + =A0 =A0 =A0 drv_callbacks.c \ > + =A0 =A0 =A0 eap_common.c \ > + =A0 =A0 =A0 eap_peap_common.c \ > + =A0 =A0 =A0 eap_register.c \ > + =A0 =A0 =A0 eapol_auth_dump.c \ > + =A0 =A0 =A0 eapol_auth_sm.c \ > + =A0 =A0 =A0 eap_server.c \ > + =A0 =A0 =A0 eap_server_methods.c \ > + =A0 =A0 =A0 eloop.c \ > + =A0 =A0 =A0 hostapd.c \ > + =A0 =A0 =A0 ieee802_11_auth.c \ > + =A0 =A0 =A0 ieee802_11_common.c \ > + =A0 =A0 =A0 ieee802_1x.c \ > + =A0 =A0 =A0 ip_addr.c \ > + =A0 =A0 =A0 main.c \ > + =A0 =A0 =A0 md5.c \ > + =A0 =A0 =A0 ms_funcs.c \ > + =A0 =A0 =A0 os_unix.c \ > + =A0 =A0 =A0 peerkey_auth.c \ > + =A0 =A0 =A0 pmksa_cache_auth.c \ > + =A0 =A0 =A0 preauth_auth.c \ > + =A0 =A0 =A0 radius.c \ > + =A0 =A0 =A0 radius_client.c \ > + =A0 =A0 =A0 sha1-pbkdf2.c \ > + =A0 =A0 =A0 sha1-tlsprf.c \ > + =A0 =A0 =A0 sha1.c \ > + =A0 =A0 =A0 sta_info.c \ > + =A0 =A0 =A0 tkip_countermeasures.c \ > + =A0 =A0 =A0 utils.c \ > + =A0 =A0 =A0 vlan_init.c \ > + =A0 =A0 =A0 wpa_auth.c \ > + =A0 =A0 =A0 wpa_auth_glue.c \ > + =A0 =A0 =A0 wpa_auth_ie.c \ > + =A0 =A0 =A0 wpa_common.c \ > + =A0 =A0 =A0 wpa_debug.c \ > + =A0 =A0 =A0 wpabuf.c > +SRCS+=3D l2_packet_freebsd.c driver_freebsd.c > > =A0MAN=3D =A0 hostapd.8 hostapd.conf.5 > > @@ -38,10 +64,11 @@ FILESDIR=3D ${SHAREDIR}/examples/hostapd > =A0FILES=3D hostapd.conf hostapd.eap_user hostapd.wpa_psk > =A0.endif > > -CFLAGS+=3D -I${HOSTAPD_DISTDIR} -I${WPA_DISTDIR}/src/drivers > - > -CFLAGS+=3D -DCONFIG_DRIVER_BSD -DHOSTAPD > -CFLAGS+=3D -DCONFIG_DRIVER_RADIUS_ACL > +CFLAGS+=3D-DCONFIG_DRIVER_BSD \ > + =A0 =A0 =A0 -DHOSTAPD \ > + =A0 =A0 =A0 -DCONFIG_DRIVER_RADIUS_ACL \ > + =A0 =A0 =A0 -DCONFIG_RSN_PREAUTH \ > + =A0 =A0 =A0 -DCONFIG_PEERKEY > =A0.if ${MK_INET6} !=3D "no" > =A0CFLAGS+=3D -DCONFIG_IPV6 > =A0.endif > @@ -55,51 +82,64 @@ CFLAGS+=3D${HOSTAPD_CFLAGS} > =A0LDADD+=3D${HOSTAPD_LDADD} > =A0#LDFLAGS+=3D${HOSTAPD_LDFLAGS} > > -.if !empty(CFLAGS:M*-DEAP_SERVER) > -#SRCS+=3D =A0 =A0 =A0 =A0eap.c eap_methods.c eap_identity.c > - > =A0.if ${MK_OPENSSL} !=3D "no" && !defined(RELEASE_CRUNCH) > > -CFLAGS+=3D-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_PSK \ > - =A0 =A0 =A0 -DEAP_TLS_FUNCS -DEAP_TLS_OPENSSL > -SRCS+=3D crypto_openssl.c > -SRCS+=3D eap_tls.c eap_peap.c eap_peap_common.c eap_mschapv2.c \ > - =A0 =A0 =A0 eap_psk.c eap_psk_common.c \ > - =A0 =A0 =A0 eap_tls_common.c tls_openssl.c ms_funcs.c chap.c > - > -CFLAGS+=3D-DEAP_TTLS -DEAP_MD5 > -SRCS+=3D eap_ttls.c eap_md5.c > - > -.if !empty(CFLAGS:M*-DEAP_GTC) > -SRCS+=3D eap_gtc.c > -.endif > +CFLAGS+=3D-DDPKCS12_FUNCS \ > + =A0 =A0 =A0 -DEAP_SERVER \ > + =A0 =A0 =A0 -DEAP_SERVER_GTC \ > + =A0 =A0 =A0 -DEAP_SERVER_IDENTITY \ > + =A0 =A0 =A0 -DEAP_SERVER_MD5 \ > + =A0 =A0 =A0 -DEAP_SERVER_MSCHAPV2 \ > + =A0 =A0 =A0 -DEAP_SERVER_PEAP \ > + =A0 =A0 =A0 -DEAP_SERVER_TLS \ > + =A0 =A0 =A0 -DEAP_SERVER_TTLS \ > + =A0 =A0 =A0 -DEAP_TLS_FUNCS \ > + =A0 =A0 =A0 -DCONFIG_NO_DUMP_STATE > +SRCS+=3D dump_state.c \ > + =A0 =A0 =A0 eap_server_gtc.c \ > + =A0 =A0 =A0 eap_server_identity.c \ > + =A0 =A0 =A0 eap_server_md5.c \ > + =A0 =A0 =A0 eap_server_mschapv2.c \ > + =A0 =A0 =A0 eap_server_peap.c \ > + =A0 =A0 =A0 eap_server_tls.c \ > + =A0 =A0 =A0 eap_server_tls_common.c \ > + =A0 =A0 =A0 eap_server_ttls.c \ > + =A0 =A0 =A0 tls_openssl.c > > =A0.if !empty(CFLAGS:M*-DEAP_AKA) > =A0NEED_SIM_COMMON=3D =A0 =A0 =A0 true > -SRCS+=3D eap_aka.c > +NEED_SHA256=3D =A0 true > +SRCS+=3D eap_server_aka.c > =A0.endif > > =A0.if !empty(CFLAGS:M*-DEAP_SIM) > =A0NEED_SIM_COMMON=3D =A0 =A0 =A0 true > -SRCS+=3D eap_sim.c > +SRCS+=3D eap_server_sim.c > =A0.endif > > =A0.if defined(NEED_SIM_COMMON) > -SRCS+=3D eap_sim_common.c eap_sim_db.c > +SRCS+=3D eap_sim_common.c \ > + =A0 =A0 =A0 eap_sim_db.c > +NEED_AES_CBC=3D =A0true > +NEED_FIPS186_2_PRF=3D =A0 =A0true > =A0.endif > > =A0.if !empty(CFLAGS:M*-DEAP_GPSK) > =A0CFLAGS+=3D-DEAP_GPSK_SHA256 > -SRCS+=3D eap_gpsk.c eap_gpsk_common.c > +SRCS+=3D eap_server_gpsk.c \ > + =A0 =A0 =A0 eap_gpsk_common.c > =A0NEED_SHA256=3D =A0 true > +NEED_AES_OMAC1=3D =A0 =A0 =A0 =A0true > =A0.endif > > =A0.if !empty(CFLAGS:M*-DEAP_PAX) > -SRCS+=3D eap_pax.c eap_pax_common.c > +SRCS+=3D eap_server_pax.c \ > + =A0 =A0 =A0 eap_pax_common.c > =A0.endif > > =A0.if !empty(CFLAGS:M*-DEAP_SAKE) > -SRCS+=3D eap_sake.c eap_sake_common.c > +SRCS+=3D eap_server_sake.c \ > + =A0 =A0 =A0 eap_sake_common.c > =A0.endif > > =A0DPADD+=3D ${LIBSSL} ${LIBCRYPTO} > @@ -108,12 +148,19 @@ LDADD+=3D -lssl -lcrypto > =A0NEED_TLS_NONE=3D true > =A0.endif > > -.else > -NEED_TLS_NONE=3D true > +.if defined(NEED_AES_CBC) > +SRCS+=3D aes-cbc.c > +.endif > + > +.if defined(NEED_AES_OMAC1) > +SRCS+=3D aes-omac1.c > +.endif > + > +.if defined(NEED_FIPS186_2_PRF) > +SRCS+=3D fips_prf_openssl.c > =A0.endif > > =A0.if defined(NEED_SHA256) > -CFLAGS+=3D-DINTERNAL_SHA256 > =A0SRCS+=3D sha256.c > =A0.endif > --=20 Ermal
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPBZQG1W-5wE01%2BETXCds5f_8bVPNXOpqgercGJz9Kf-EL28uQ>