Module Name:	src
Committed By:	rpaulo
Date:		Wed Apr 12 15:10:28 UTC 2006

Update of /cvsroot/src/dist/wpa_supplicant
In directory ivanova.netbsd.org:/tmp/cvs-serv2515

Log Message:
Import of WPA supplicant 0.4.8


Vendor Tag:	MALINEN
Release Tags:	v0_4_8
		
U src/dist/wpa_supplicant/ChangeLog
U src/dist/wpa_supplicant/Makefile
U src/dist/wpa_supplicant/README
N src/dist/wpa_supplicant/base64.c
N src/dist/wpa_supplicant/base64.h
C src/dist/wpa_supplicant/config.c
U src/dist/wpa_supplicant/config.h
N src/dist/wpa_supplicant/config_file.c
U src/dist/wpa_supplicant/config_ssid.h
U src/dist/wpa_supplicant/crypto.c
U src/dist/wpa_supplicant/crypto.h
N src/dist/wpa_supplicant/crypto_gnutls.c
U src/dist/wpa_supplicant/ctrl_iface.c
U src/dist/wpa_supplicant/ctrl_iface.h
U src/dist/wpa_supplicant/defconfig
U src/dist/wpa_supplicant/defs.h
U src/dist/wpa_supplicant/driver.h
N src/dist/wpa_supplicant/driver_hostap.h
N src/dist/wpa_supplicant/driver_wired.c
U src/dist/wpa_supplicant/drivers.c
U src/dist/wpa_supplicant/eap.c
U src/dist/wpa_supplicant/eap.h
U src/dist/wpa_supplicant/eap_aka.c
U src/dist/wpa_supplicant/eap_defs.h
U src/dist/wpa_supplicant/eap_fast.c
U src/dist/wpa_supplicant/eap_gtc.c
U src/dist/wpa_supplicant/eap_i.h
U src/dist/wpa_supplicant/eap_leap.c
U src/dist/wpa_supplicant/eap_md5.c
U src/dist/wpa_supplicant/eap_mschapv2.c
U src/dist/wpa_supplicant/eap_otp.c
N src/dist/wpa_supplicant/eap_pax.c
N src/dist/wpa_supplicant/eap_pax_common.c
N src/dist/wpa_supplicant/eap_pax_common.h
U src/dist/wpa_supplicant/eap_peap.c
U src/dist/wpa_supplicant/eap_psk.c
N src/dist/wpa_supplicant/eap_psk_common.c
N src/dist/wpa_supplicant/eap_psk_common.h
U src/dist/wpa_supplicant/eap_sim.c
U src/dist/wpa_supplicant/eap_sim_common.c
U src/dist/wpa_supplicant/eap_sim_common.h
U src/dist/wpa_supplicant/eap_testing.txt
U src/dist/wpa_supplicant/eap_tls.c
U src/dist/wpa_supplicant/eap_tls_common.c
U src/dist/wpa_supplicant/eap_tls_common.h
U src/dist/wpa_supplicant/eap_tlv.c
U src/dist/wpa_supplicant/eap_tlv.h
U src/dist/wpa_supplicant/eap_ttls.c
U src/dist/wpa_supplicant/eap_ttls.h
U src/dist/wpa_supplicant/eapol_sm.c
U src/dist/wpa_supplicant/eapol_sm.h
U src/dist/wpa_supplicant/eapol_test.c
N src/dist/wpa_supplicant/events.c
N src/dist/wpa_supplicant/hostapd.h
U src/dist/wpa_supplicant/l2_packet.h
N src/dist/wpa_supplicant/main.c
U src/dist/wpa_supplicant/ms_funcs.c
U src/dist/wpa_supplicant/ms_funcs.h
U src/dist/wpa_supplicant/openssl-tls-extensions.patch
U src/dist/wpa_supplicant/pcsc_funcs.c
U src/dist/wpa_supplicant/pcsc_funcs.h
N src/dist/wpa_supplicant/preauth.c
N src/dist/wpa_supplicant/preauth.h
U src/dist/wpa_supplicant/preauth_test.c
U src/dist/wpa_supplicant/tls.h
N src/dist/wpa_supplicant/tls_gnutls.c
U src/dist/wpa_supplicant/tls_none.c
U src/dist/wpa_supplicant/tls_openssl.c
U src/dist/wpa_supplicant/wpa.c
N src/dist/wpa_supplicant/tls_schannel.c
U src/dist/wpa_supplicant/todo.txt
U src/dist/wpa_supplicant/version.h
U src/dist/wpa_supplicant/wpa.h
U src/dist/wpa_supplicant/wpa_cli.c
U src/dist/wpa_supplicant/wpa_ctrl.c
U src/dist/wpa_supplicant/wpa_ctrl.h
N src/dist/wpa_supplicant/wpa_i.h
U src/dist/wpa_supplicant/wpa_passphrase.c
U src/dist/wpa_supplicant/wpa_supplicant.c
U src/dist/wpa_supplicant/wpa_supplicant.conf
U src/dist/wpa_supplicant/wpa_supplicant.h
U src/dist/wpa_supplicant/wpa_supplicant_i.h
U src/dist/wpa_supplicant/COPYING
U src/dist/wpa_supplicant/eloop.c
U src/dist/wpa_supplicant/eloop.h
U src/dist/wpa_supplicant/common.c
C src/dist/wpa_supplicant/common.h
U src/dist/wpa_supplicant/md5.c
U src/dist/wpa_supplicant/md5.h
U src/dist/wpa_supplicant/rc4.c
U src/dist/wpa_supplicant/rc4.h
U src/dist/wpa_supplicant/sha1.c
U src/dist/wpa_supplicant/sha1.h
U src/dist/wpa_supplicant/aes_wrap.c
U src/dist/wpa_supplicant/aes_wrap.h
U src/dist/wpa_supplicant/aes.c
U src/dist/wpa_supplicant/radius.c
U src/dist/wpa_supplicant/radius.h
U src/dist/wpa_supplicant/radius_client.c
U src/dist/wpa_supplicant/radius_client.h
N src/dist/wpa_supplicant/config_types.h
N src/dist/wpa_supplicant/doc/code_structure.doxygen
N src/dist/wpa_supplicant/doc/ctrl_iface.doxygen
N src/dist/wpa_supplicant/doc/doxygen.fast
N src/dist/wpa_supplicant/doc/doxygen.full
N src/dist/wpa_supplicant/doc/driver_wrapper.doxygen
N src/dist/wpa_supplicant/doc/eap.doxygen
N src/dist/wpa_supplicant/doc/kerneldoc2doxygen.pl
N src/dist/wpa_supplicant/doc/mainpage.doxygen
N src/dist/wpa_supplicant/doc/porting.doxygen
N src/dist/wpa_supplicant/doc/testing_tools.doxygen
U src/dist/wpa_supplicant/doc/wpa_supplicant.fig
N src/dist/wpa_supplicant/doc/docbook/Makefile
N src/dist/wpa_supplicant/doc/docbook/wpa_background.sgml
N src/dist/wpa_supplicant/doc/docbook/wpa_cli.sgml
N src/dist/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
N src/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml
N src/dist/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
N src/dist/wpa_supplicant/doc/docbook/wpa_background.8
N src/dist/wpa_supplicant/doc/docbook/wpa_cli.8
N src/dist/wpa_supplicant/doc/docbook/wpa_passphrase.8
N src/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
N src/dist/wpa_supplicant/doc/docbook/wpa_supplicant.8
N src/dist/wpa_supplicant/examples/ieee8021x.conf
N src/dist/wpa_supplicant/examples/plaintext.conf
N src/dist/wpa_supplicant/examples/wep.conf
N src/dist/wpa_supplicant/examples/wpa-psk-tkip.conf
N src/dist/wpa_supplicant/examples/wpa2-eap-ccmp.conf

2 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jMALINEN:yesterday -jMALINEN src/dist/wpa_supplicant