svn commit: r189263 - in head/usr.sbin/wpa: . hostapd hostapd_cli wpa_cli wpa_supplicant

[Slawa Olhovchenkov]

On Mon, Dec 19, 2011 at 11:45:06PM +0400, Slawa Olhovchenkov wrote:

> > >>>> Author: sam
> > >>>> Date: Mon Mar  2 02:28:22 2009
> > >>>> New Revision: 189263
> > >>>> URL: http://svn.freebsd.org/changeset/base/189263
> > >>>> 
> > >>>> Log:
> > >>>>   update to 0.6.8
> > >>>> 
> > >>>>   Reviewed by:        thompsa
> > >>>> 
> > >>>> Modified:
> > >>>>   head/usr.sbin/wpa/Makefile.inc
> > >>>>   head/usr.sbin/wpa/hostapd/Makefile
> > >>>>   head/usr.sbin/wpa/hostapd/driver_freebsd.c
> > >>>>   head/usr.sbin/wpa/hostapd_cli/Makefile
> > >>>>   head/usr.sbin/wpa/wpa_cli/Makefile
> > >>>>   head/usr.sbin/wpa/wpa_supplicant/Makefile
> > >>>>   head/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
> > >>>>   head/usr.sbin/wpa/wpa_supplicant/driver_wired.c
> > >>>> Modified: head/usr.sbin/wpa/hostapd/Makefile
> > >>>> ==============================================================================
> > >>>> --- head/usr.sbin/wpa/hostapd/Makefile        Mon Mar  2 02:26:53 2009        (r189262)
> > >>>> +++ head/usr.sbin/wpa/hostapd/Makefile        Mon Mar  2 02:28:22 2009        (r189263)
> > >>> 
> > >>>>  .if !empty(CFLAGS:M*-DEAP_SERVER)
> > >>>> -SRCS+=       eap.c eap_methods.c eap_identity.c
> > >>>> +#SRCS+=      eap.c eap_methods.c eap_identity.c
> > >>> 
> > >>> EAP_SERVER functionality removed. Why?
> > >> 
> > >> EAP support is only removed if -DEAP_SERVER isn't in CFLAGS (which
> > >> seems like a bad idea because it should really be a bsd.own.mk knob).
> > > 
> > > Sorry, I don't understand.
> > > Some time ago I have in src.conf HOSTAPD_CFLAGS=-DEAP_TLS -DEAP_SERVER
> > > and got hostapd witch support EAP metods. Now this is don't work:
> > > 
> > > ===> hostapd (all)
> > > make: don't know how to make eap_tls.c. Stop
> > > 
> > > How I can build hostapd witch support EAP metods?
> > 
> > 	Missed the commenting out part of the commit. Yeah, that might not work.
> 
> Some time ago exist two  eap_tls.c:
> 
> /usr/src/contrib/wpa/src/eap_peer/eap_tls.c
> /usr/src/contrib/wpa/src/eap_server/eap_tls.c
> 
> Now exist only /usr/src/contrib/wpa/src/eap_peer/eap_tls.c. But
> /usr/src/contrib/wpa/src/eap_peer/ don't included in SRC path search
> list and eap_tls.c from eap_peer have extra depends.

This file (and some other files) renamed in commit r214734.
And some other files added/splited.

Can someone commit next diff:

===
--- hostapd/Makefile    2011-12-20 00:45:13.000000000 +0400
+++ Makefile.new        2011-12-20 00:28:29.000000000 +0400
@@ -62,13 +62,10 @@
 
 CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_PSK \
        -DEAP_TLS_FUNCS -DEAP_TLS_OPENSSL
-SRCS+= crypto_openssl.c
-SRCS+= eap_tls.c eap_peap.c eap_peap_common.c eap_mschapv2.c \
-       eap_psk.c eap_psk_common.c \
-       eap_tls_common.c tls_openssl.c ms_funcs.c chap.c
+SRCS+= eap_server_psk.c eap_psk_common.c \
+       tls_openssl.c aes-encblock.c aes-omac1.c aes-eax.c aes-ctr.c
 
 CFLAGS+=-DEAP_TTLS -DEAP_MD5
-SRCS+= eap_ttls.c eap_md5.c
 
 .if !empty(CFLAGS:M*-DEAP_GTC)
 SRCS+= eap_gtc.c