CVS commit: src/dist/wpa

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 07:27:32 UTC 2008

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

Log Message:
Import wpa_supplicant and hostapd

Status:

Vendor Tag:     MALINEN
Release Tags:   v0_6_4
                
U src/dist/wpa/COPYING
U src/dist/wpa/README
U src/dist/wpa/patches/openssl-0.9.8-tls-extensions.patch
U src/dist/wpa/patches/openssl-0.9.8d-tls-extensions.patch
U src/dist/wpa/patches/openssl-0.9.8e-tls-extensions.patch
U src/dist/wpa/patches/openssl-0.9.8g-tls-extensions.patch
N src/dist/wpa/patches/openssl-0.9.8h-tls-extensions.patch
U src/dist/wpa/patches/openssl-0.9.9-session-ticket.patch
U src/dist/wpa/src/Makefile
U src/dist/wpa/src/common/eapol_common.h
U src/dist/wpa/src/common/.gitignore
U src/dist/wpa/src/common/Makefile
U src/dist/wpa/src/common/defs.h
U src/dist/wpa/src/common/ieee802_11_defs.h
U src/dist/wpa/src/common/privsep_commands.h
U src/dist/wpa/src/common/version.h
U src/dist/wpa/src/common/wireless_copy.h
U src/dist/wpa/src/common/wpa_common.c
U src/dist/wpa/src/common/wpa_common.h
U src/dist/wpa/src/common/wpa_ctrl.c
U src/dist/wpa/src/common/wpa_ctrl.h
U src/dist/wpa/src/crypto/crypto_cryptoapi.c
U src/dist/wpa/src/crypto/.gitignore
U src/dist/wpa/src/crypto/Makefile
U src/dist/wpa/src/crypto/aes.c
U src/dist/wpa/src/crypto/aes.h
U src/dist/wpa/src/crypto/aes_wrap.c
U src/dist/wpa/src/crypto/aes_wrap.h
U src/dist/wpa/src/crypto/crypto.h
U src/dist/wpa/src/crypto/crypto_internal.c
U src/dist/wpa/src/crypto/crypto_gnutls.c
U src/dist/wpa/src/crypto/tls_gnutls.c
U src/dist/wpa/src/crypto/rc4.c
U src/dist/wpa/src/crypto/crypto_libtomcrypt.c
U src/dist/wpa/src/crypto/crypto_none.c
U src/dist/wpa/src/crypto/crypto_openssl.c
U src/dist/wpa/src/crypto/des.c
U src/dist/wpa/src/crypto/dh_groups.c
U src/dist/wpa/src/crypto/dh_groups.h
U src/dist/wpa/src/crypto/md4.c
U src/dist/wpa/src/crypto/md5.c
U src/dist/wpa/src/crypto/md5.h
U src/dist/wpa/src/crypto/ms_funcs.c
U src/dist/wpa/src/crypto/rc4.h
U src/dist/wpa/src/crypto/ms_funcs.h
U src/dist/wpa/src/crypto/sha1.c
U src/dist/wpa/src/crypto/sha1.h
U src/dist/wpa/src/crypto/sha256.c
U src/dist/wpa/src/crypto/sha256.h
U src/dist/wpa/src/crypto/tls.h
U src/dist/wpa/src/crypto/tls_internal.c
U src/dist/wpa/src/crypto/tls_none.c
U src/dist/wpa/src/crypto/tls_openssl.c
U src/dist/wpa/src/crypto/tls_schannel.c
U src/dist/wpa/src/drivers/MobileApple80211.c
U src/dist/wpa/src/drivers/.gitignore
U src/dist/wpa/src/drivers/Apple80211.h
U src/dist/wpa/src/drivers/Makefile
U src/dist/wpa/src/drivers/MobileApple80211.h
U src/dist/wpa/src/drivers/driver.h
U src/dist/wpa/src/drivers/driver_atmel.c
U src/dist/wpa/src/drivers/driver_broadcom.c
U src/dist/wpa/src/drivers/driver_bsd.c
U src/dist/wpa/src/drivers/driver_hostap.c
U src/dist/wpa/src/drivers/driver_hostap.h
U src/dist/wpa/src/drivers/driver_iphone.m
U src/dist/wpa/src/drivers/driver_ipw.c
U src/dist/wpa/src/drivers/driver_madwifi.c
U src/dist/wpa/src/drivers/driver_ndis.c
U src/dist/wpa/src/drivers/driver_ndis.h
U src/dist/wpa/src/drivers/driver_ndis_.c
U src/dist/wpa/src/drivers/driver_ndiswrapper.c
N src/dist/wpa/src/drivers/driver_nl80211.c
U src/dist/wpa/src/drivers/driver_osx.m
U src/dist/wpa/src/drivers/driver_prism54.c
U src/dist/wpa/src/drivers/driver_privsep.c
N src/dist/wpa/src/drivers/driver_ps3.c
U src/dist/wpa/src/drivers/driver_ralink.c
U src/dist/wpa/src/drivers/driver_ralink.h
U src/dist/wpa/src/drivers/driver_test.c
U src/dist/wpa/src/drivers/driver_wext.c
U src/dist/wpa/src/drivers/driver_wext.h
U src/dist/wpa/src/drivers/driver_wired.c
U src/dist/wpa/src/drivers/drivers.c
U src/dist/wpa/src/drivers/ndis_events.c
U src/dist/wpa/src/drivers/priv_netlink.h
U src/dist/wpa/src/drivers/scan_helpers.c
N src/dist/wpa/src/eap_common/eap_fast_common.c
U src/dist/wpa/src/eap_common/.gitignore
U src/dist/wpa/src/eap_common/Makefile
U src/dist/wpa/src/eap_common/chap.c
U src/dist/wpa/src/eap_common/chap.h
U src/dist/wpa/src/eap_common/eap_common.c
U src/dist/wpa/src/eap_common/eap_common.h
U src/dist/wpa/src/eap_common/eap_defs.h
U src/dist/wpa/src/eap_common/eap_fast_common.h
U src/dist/wpa/src/eap_common/eap_gpsk_common.c
U src/dist/wpa/src/eap_common/eap_gpsk_common.h
U src/dist/wpa/src/eap_common/eap_ikev2_common.c
U src/dist/wpa/src/eap_common/eap_ikev2_common.h
U src/dist/wpa/src/eap_common/eap_pax_common.c
U src/dist/wpa/src/eap_common/eap_pax_common.h
N src/dist/wpa/src/eap_common/eap_peap_common.c
N src/dist/wpa/src/eap_common/eap_peap_common.h
U src/dist/wpa/src/eap_common/eap_psk_common.c
U src/dist/wpa/src/eap_common/eap_psk_common.h
U src/dist/wpa/src/eap_common/eap_sake_common.c
U src/dist/wpa/src/eap_common/eap_sake_common.h
U src/dist/wpa/src/eap_common/eap_sim_common.c
U src/dist/wpa/src/eap_common/eap_sim_common.h
U src/dist/wpa/src/eap_common/eap_tlv_common.h
U src/dist/wpa/src/eap_common/eap_ttls.h
U src/dist/wpa/src/eap_common/ikev2_common.c
U src/dist/wpa/src/eap_common/ikev2_common.h
U src/dist/wpa/src/eap_peer/eap_fast_pac.c
U src/dist/wpa/src/eap_peer/.gitignore
U src/dist/wpa/src/eap_peer/Makefile
U src/dist/wpa/src/eap_peer/eap.c
U src/dist/wpa/src/eap_peer/eap.h
U src/dist/wpa/src/eap_peer/eap_aka.c
N src/dist/wpa/src/eap_peer/eap_config.h
U src/dist/wpa/src/eap_peer/eap_fast.c
U src/dist/wpa/src/eap_peer/eap_vendor_test.c
U src/dist/wpa/src/eap_peer/eap_fast_pac.h
U src/dist/wpa/src/eap_peer/eap_gpsk.c
U src/dist/wpa/src/eap_peer/eap_gtc.c
U src/dist/wpa/src/eap_peer/eap_i.h
U src/dist/wpa/src/eap_peer/eap_ikev2.c
U src/dist/wpa/src/eap_peer/eap_leap.c
U src/dist/wpa/src/eap_peer/eap_md5.c
U src/dist/wpa/src/eap_peer/eap_methods.c
U src/dist/wpa/src/eap_peer/eap_methods.h
U src/dist/wpa/src/eap_peer/eap_mschapv2.c
U src/dist/wpa/src/eap_peer/eap_otp.c
U src/dist/wpa/src/eap_peer/eap_pax.c
U src/dist/wpa/src/eap_peer/eap_peap.c
U src/dist/wpa/src/eap_peer/ikev2.c
U src/dist/wpa/src/eap_peer/eap_psk.c
U src/dist/wpa/src/eap_peer/eap_sake.c
U src/dist/wpa/src/eap_peer/eap_sim.c
U src/dist/wpa/src/eap_peer/eap_tls.c
U src/dist/wpa/src/eap_peer/eap_tls_common.c
U src/dist/wpa/src/eap_peer/eap_tls_common.h
U src/dist/wpa/src/eap_peer/eap_tnc.c
U src/dist/wpa/src/eap_peer/eap_ttls.c
N src/dist/wpa/src/eap_peer/mschapv2.c
U src/dist/wpa/src/eap_peer/ikev2.h
N src/dist/wpa/src/eap_peer/mschapv2.h
U src/dist/wpa/src/eap_peer/tncc.c
U src/dist/wpa/src/eap_peer/tncc.h
U src/dist/wpa/src/eap_server/eap_identity.c
U src/dist/wpa/src/eap_server/.gitignore
U src/dist/wpa/src/eap_server/Makefile
U src/dist/wpa/src/eap_server/eap.c
U src/dist/wpa/src/eap_server/eap.h
U src/dist/wpa/src/eap_server/eap_aka.c
U src/dist/wpa/src/eap_server/eap_fast.c
U src/dist/wpa/src/eap_server/eap_gpsk.c
U src/dist/wpa/src/eap_server/eap_gtc.c
U src/dist/wpa/src/eap_server/eap_i.h
U src/dist/wpa/src/eap_server/eap_methods.c
U src/dist/wpa/src/eap_server/eap_ikev2.c
U src/dist/wpa/src/eap_server/eap_md5.c
U src/dist/wpa/src/eap_server/eap_tls_common.c
U src/dist/wpa/src/eap_server/eap_methods.h
U src/dist/wpa/src/eap_server/eap_mschapv2.c
U src/dist/wpa/src/eap_server/eap_pax.c
U src/dist/wpa/src/eap_server/eap_peap.c
U src/dist/wpa/src/eap_server/eap_psk.c
U src/dist/wpa/src/eap_server/eap_sake.c
U src/dist/wpa/src/eap_server/eap_sim.c
U src/dist/wpa/src/eap_server/eap_sim_db.c
U src/dist/wpa/src/eap_server/eap_tls.c
U src/dist/wpa/src/eap_server/eap_sim_db.h
U src/dist/wpa/src/eap_server/eap_vendor_test.c
U src/dist/wpa/src/eap_server/eap_tls_common.h
N src/dist/wpa/src/eap_server/eap_tnc.c
U src/dist/wpa/src/eap_server/eap_ttls.c
U src/dist/wpa/src/eap_server/ikev2.c
U src/dist/wpa/src/eap_server/ikev2.h
N src/dist/wpa/src/eap_server/tncs.c
N src/dist/wpa/src/eap_server/tncs.h
C src/dist/wpa/src/eapol_supp/eapol_supp_sm.c
U src/dist/wpa/src/eapol_supp/.gitignore
U src/dist/wpa/src/eapol_supp/Makefile
C src/dist/wpa/src/eapol_supp/eapol_supp_sm.h
U src/dist/wpa/src/hlr_auc_gw/.gitignore
U src/dist/wpa/src/hlr_auc_gw/Makefile
U src/dist/wpa/src/hlr_auc_gw/hlr_auc_gw.c
U src/dist/wpa/src/hlr_auc_gw/milenage.c
U src/dist/wpa/src/hlr_auc_gw/milenage.h
U src/dist/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db
U src/dist/wpa/src/l2_packet/l2_packet_freebsd.c
U src/dist/wpa/src/l2_packet/.gitignore
U src/dist/wpa/src/l2_packet/Makefile
U src/dist/wpa/src/l2_packet/l2_packet.h
U src/dist/wpa/src/l2_packet/l2_packet_linux.c
U src/dist/wpa/src/l2_packet/l2_packet_ndis.c
U src/dist/wpa/src/l2_packet/l2_packet_none.c
U src/dist/wpa/src/l2_packet/l2_packet_pcap.c
U src/dist/wpa/src/l2_packet/l2_packet_privsep.c
U src/dist/wpa/src/l2_packet/l2_packet_winpcap.c
U src/dist/wpa/src/radius/radius_client.c
U src/dist/wpa/src/radius/.gitignore
U src/dist/wpa/src/radius/Makefile
U src/dist/wpa/src/radius/radius.c
U src/dist/wpa/src/radius/radius.h
U src/dist/wpa/src/radius/radius_client.h
U src/dist/wpa/src/radius/radius_server.c
U src/dist/wpa/src/radius/radius_server.h
U src/dist/wpa/src/rsn_supp/pmksa_cache.c
U src/dist/wpa/src/rsn_supp/.gitignore
U src/dist/wpa/src/rsn_supp/Makefile
U src/dist/wpa/src/rsn_supp/peerkey.c
U src/dist/wpa/src/rsn_supp/peerkey.h
U src/dist/wpa/src/rsn_supp/pmksa_cache.h
U src/dist/wpa/src/rsn_supp/preauth.c
U src/dist/wpa/src/rsn_supp/preauth.h
C src/dist/wpa/src/rsn_supp/wpa.c
C src/dist/wpa/src/rsn_supp/wpa.h
U src/dist/wpa/src/rsn_supp/wpa_ft.c
C src/dist/wpa/src/rsn_supp/wpa_i.h
U src/dist/wpa/src/rsn_supp/wpa_ie.c
U src/dist/wpa/src/rsn_supp/wpa_ie.h
U src/dist/wpa/src/tls/tlsv1_client.c
U src/dist/wpa/src/tls/.gitignore
U src/dist/wpa/src/tls/Makefile
U src/dist/wpa/src/tls/asn1.c
U src/dist/wpa/src/tls/asn1.h
U src/dist/wpa/src/tls/asn1_test.c
U src/dist/wpa/src/tls/bignum.c
U src/dist/wpa/src/tls/bignum.h
U src/dist/wpa/src/tls/libtommath.c
U src/dist/wpa/src/tls/rsa.c
U src/dist/wpa/src/tls/rsa.h
U src/dist/wpa/src/tls/tlsv1_client_read.c
U src/dist/wpa/src/tls/tlsv1_client.h
U src/dist/wpa/src/tls/tlsv1_client_i.h
U src/dist/wpa/src/tls/tlsv1_client_write.c
U src/dist/wpa/src/tls/tlsv1_common.c
U src/dist/wpa/src/tls/tlsv1_common.h
U src/dist/wpa/src/tls/tlsv1_cred.c
U src/dist/wpa/src/tls/tlsv1_cred.h
U src/dist/wpa/src/tls/tlsv1_record.c
U src/dist/wpa/src/tls/tlsv1_record.h
U src/dist/wpa/src/tls/tlsv1_server.c
U src/dist/wpa/src/tls/tlsv1_server.h
U src/dist/wpa/src/tls/tlsv1_server_i.h
U src/dist/wpa/src/tls/tlsv1_server_read.c
U src/dist/wpa/src/tls/tlsv1_server_write.c
U src/dist/wpa/src/tls/x509v3.c
U src/dist/wpa/src/tls/x509v3.h
U src/dist/wpa/src/utils/build_config.h
U src/dist/wpa/src/utils/.gitignore
U src/dist/wpa/src/utils/Makefile
U src/dist/wpa/src/utils/base64.c
U src/dist/wpa/src/utils/base64.h
U src/dist/wpa/src/utils/eloop_none.c
U src/dist/wpa/src/utils/common.c
U src/dist/wpa/src/utils/common.h
U src/dist/wpa/src/utils/eloop.c
U src/dist/wpa/src/utils/eloop.h
U src/dist/wpa/src/utils/os_internal.c
U src/dist/wpa/src/utils/eloop_win.c
U src/dist/wpa/src/utils/includes.h
U src/dist/wpa/src/utils/ip_addr.c
U src/dist/wpa/src/utils/ip_addr.h
U src/dist/wpa/src/utils/os.h
U src/dist/wpa/src/utils/os_none.c
U src/dist/wpa/src/utils/os_unix.c
U src/dist/wpa/src/utils/os_win32.c
U src/dist/wpa/src/utils/pcsc_funcs.c
U src/dist/wpa/src/utils/pcsc_funcs.h
U src/dist/wpa/src/utils/state_machine.h
N src/dist/wpa/src/utils/uuid.c
N src/dist/wpa/src/utils/uuid.h
U src/dist/wpa/src/utils/wpa_debug.c
U src/dist/wpa/src/utils/wpa_debug.h
U src/dist/wpa/src/utils/wpabuf.c
U src/dist/wpa/src/utils/wpabuf.h
U src/dist/wpa/wpa_supplicant/README-Windows.txt
U src/dist/wpa/wpa_supplicant/.gitignore
U src/dist/wpa/wpa_supplicant/ChangeLog
U src/dist/wpa/wpa_supplicant/Makefile
U src/dist/wpa/wpa_supplicant/README
U src/dist/wpa/wpa_supplicant/config_file.c
U src/dist/wpa/wpa_supplicant/blacklist.c
U src/dist/wpa/wpa_supplicant/blacklist.h
U src/dist/wpa/wpa_supplicant/config.c
U src/dist/wpa/wpa_supplicant/config.h
U src/dist/wpa/wpa_supplicant/ctrl_iface_dbus.c
U src/dist/wpa/wpa_supplicant/config_none.c
U src/dist/wpa/wpa_supplicant/config_ssid.h
U src/dist/wpa/wpa_supplicant/config_winreg.c
U src/dist/wpa/wpa_supplicant/ctrl_iface.c
U src/dist/wpa/wpa_supplicant/ctrl_iface.h
U src/dist/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c
U src/dist/wpa/wpa_supplicant/ctrl_iface_dbus.h
U src/dist/wpa/wpa_supplicant/ctrl_iface_unix.c
U src/dist/wpa/wpa_supplicant/ctrl_iface_udp.c
U src/dist/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h
U src/dist/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
U src/dist/wpa/wpa_supplicant/dbus-wpa_supplicant.service
U src/dist/wpa/wpa_supplicant/dbus-wpa_supplicant.conf
U src/dist/wpa/wpa_supplicant/eap_testing.txt
U src/dist/wpa/wpa_supplicant/dbus_dict_helpers.c
U src/dist/wpa/wpa_supplicant/dbus_dict_helpers.h
U src/dist/wpa/wpa_supplicant/defconfig
U src/dist/wpa/wpa_supplicant/eapol_test.c
C src/dist/wpa/wpa_supplicant/events.c
U src/dist/wpa/wpa_supplicant/main_none.c
U src/dist/wpa/wpa_supplicant/main.c
U src/dist/wpa/wpa_supplicant/nmake.mak
U src/dist/wpa/wpa_supplicant/main_symbian.cpp
U src/dist/wpa/wpa_supplicant/main_winmain.c
U src/dist/wpa/wpa_supplicant/main_winsvc.c
U src/dist/wpa/wpa_supplicant/mlme.c
U src/dist/wpa/wpa_supplicant/mlme.h
C src/dist/wpa/wpa_supplicant/preauth_test.c
U src/dist/wpa/wpa_supplicant/scan.c
U src/dist/wpa/wpa_supplicant/todo.txt
U src/dist/wpa/wpa_supplicant/win_example.reg
U src/dist/wpa/wpa_supplicant/win_if_list.c
C src/dist/wpa/wpa_supplicant/wpa_cli.c
U src/dist/wpa/wpa_supplicant/wpa_supplicant.conf
U src/dist/wpa/wpa_supplicant/wpa_passphrase.c
U src/dist/wpa/wpa_supplicant/wpa_priv.c
U src/dist/wpa/wpa_supplicant/wpa_supplicant.c
U src/dist/wpa/wpa_supplicant/wpa_supplicant_i.h
C src/dist/wpa/wpa_supplicant/wpas_glue.c
U src/dist/wpa/wpa_supplicant/wpas_glue.h
U src/dist/wpa/wpa_supplicant/doc/ctrl_iface.doxygen
U src/dist/wpa/wpa_supplicant/doc/.gitignore
U src/dist/wpa/wpa_supplicant/doc/doxygen.fast
U src/dist/wpa/wpa_supplicant/doc/code_structure.doxygen
U src/dist/wpa/wpa_supplicant/doc/mainpage.doxygen
U src/dist/wpa/wpa_supplicant/doc/doxygen.full
U src/dist/wpa/wpa_supplicant/doc/eap.doxygen
U src/dist/wpa/wpa_supplicant/doc/driver_wrapper.doxygen
U src/dist/wpa/wpa_supplicant/doc/testing_tools.doxygen
U src/dist/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
U src/dist/wpa/wpa_supplicant/doc/porting.doxygen
U src/dist/wpa/wpa_supplicant/doc/wpa_supplicant.fig
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/.gitignore
U src/dist/wpa/wpa_supplicant/doc/docbook/Makefile
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_background.8
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_cli.8
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_gui.8
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_priv.8
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
U src/dist/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8
N src/dist/wpa/wpa_supplicant/examples/openCryptoki.conf
U src/dist/wpa/wpa_supplicant/examples/ieee8021x.conf
U src/dist/wpa/wpa_supplicant/examples/wpa-psk-tkip.conf
U src/dist/wpa/wpa_supplicant/examples/plaintext.conf
U src/dist/wpa/wpa_supplicant/examples/wep.conf
U src/dist/wpa/wpa_supplicant/examples/wpa2-eap-ccmp.conf
U src/dist/wpa/wpa_supplicant/examples/wpas-test.py
U src/dist/wpa/wpa_supplicant/symbian/wpa_supplicant.mmp
U src/dist/wpa/wpa_supplicant/symbian/README.symbian
U src/dist/wpa/wpa_supplicant/symbian/bld.inf
U src/dist/wpa/wpa_supplicant/tests/test_ms_funcs.c
U src/dist/wpa/wpa_supplicant/tests/link_test.c
U src/dist/wpa/wpa_supplicant/tests/test_aes.c
U src/dist/wpa/wpa_supplicant/tests/test_md4.c
U src/dist/wpa/wpa_supplicant/tests/test_md5.c
U src/dist/wpa/wpa_supplicant/tests/test_eap_sim_common.c
U src/dist/wpa/wpa_supplicant/tests/test_sha256.c
U src/dist/wpa/wpa_supplicant/tests/test_sha1.c
U src/dist/wpa/wpa_supplicant/tests/test_x509v3.c
U src/dist/wpa/wpa_supplicant/tests/test_wpa.c
U src/dist/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
U src/dist/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh
U src/dist/wpa/wpa_supplicant/vs2005/wpa_supplicant.sln
U src/dist/wpa/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
U src/dist/wpa/wpa_supplicant/vs2005/win_if_list/win_if_list.vcproj
U src/dist/wpa/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
U src/dist/wpa/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
U src/dist/wpa/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
U src/dist/wpa/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/.gitignore
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/eventhistory.h
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/main.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/networkconfig.h
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/scanresults.h
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/scanresults.ui
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/wpagui.h
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/wpagui.ui
U src/dist/wpa/wpa_supplicant/wpa_gui-qt4/wpamsg.h
U src/dist/wpa/wpa_supplicant/wpa_gui/eventhistory.ui
U src/dist/wpa/wpa_supplicant/wpa_gui/.gitignore
U src/dist/wpa/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling
U src/dist/wpa/wpa_supplicant/wpa_gui/eventhistory.ui.h
U src/dist/wpa/wpa_supplicant/wpa_gui/main.cpp
U src/dist/wpa/wpa_supplicant/wpa_gui/networkconfig.ui
U src/dist/wpa/wpa_supplicant/wpa_gui/networkconfig.ui.h
U src/dist/wpa/wpa_supplicant/wpa_gui/scanresults.ui
U src/dist/wpa/wpa_supplicant/wpa_gui/scanresults.ui.h
U src/dist/wpa/wpa_supplicant/wpa_gui/userdatarequest.ui
U src/dist/wpa/wpa_supplicant/wpa_gui/userdatarequest.ui.h
U src/dist/wpa/wpa_supplicant/wpa_gui/wpa_gui.pro
U src/dist/wpa/wpa_supplicant/wpa_gui/wpagui.ui
U src/dist/wpa/wpa_supplicant/wpa_gui/wpagui.ui.h
U src/dist/wpa/wpa_supplicant/wpa_gui/wpamsg.h
U src/dist/wpa/hostapd/developer.txt
U src/dist/wpa/hostapd/.gitignore
U src/dist/wpa/hostapd/ChangeLog
U src/dist/wpa/hostapd/Makefile
U src/dist/wpa/hostapd/README
U src/dist/wpa/hostapd/accounting.c
U src/dist/wpa/hostapd/accounting.h
U src/dist/wpa/hostapd/ap.h
U src/dist/wpa/hostapd/ap_list.c
U src/dist/wpa/hostapd/ap_list.h
U src/dist/wpa/hostapd/beacon.c
U src/dist/wpa/hostapd/beacon.h
C src/dist/wpa/hostapd/config.c
U src/dist/wpa/hostapd/config.h
U src/dist/wpa/hostapd/ctrl_iface.c
U src/dist/wpa/hostapd/ctrl_iface.h
U src/dist/wpa/hostapd/defconfig
U src/dist/wpa/hostapd/driver_bsd.c
U src/dist/wpa/hostapd/driver.h
U src/dist/wpa/hostapd/hostapd.radius_clients
U src/dist/wpa/hostapd/driver_hostap.c
U src/dist/wpa/hostapd/drivers.c
U src/dist/wpa/hostapd/driver_madwifi.c
U src/dist/wpa/hostapd/driver_nl80211.c
U src/dist/wpa/hostapd/driver_prism54.c
U src/dist/wpa/hostapd/driver_test.c
U src/dist/wpa/hostapd/driver_wired.c
N src/dist/wpa/hostapd/eap_testing.txt
U src/dist/wpa/hostapd/eapol_sm.c
U src/dist/wpa/hostapd/eapol_sm.h
U src/dist/wpa/hostapd/hostap_common.h
U src/dist/wpa/hostapd/hostapd.8
U src/dist/wpa/hostapd/hostapd.accept
U src/dist/wpa/hostapd/hostapd.c
U src/dist/wpa/hostapd/hostapd.conf
U src/dist/wpa/hostapd/hostapd.deny
U src/dist/wpa/hostapd/hostapd.eap_user
U src/dist/wpa/hostapd/hostapd.h
U src/dist/wpa/hostapd/ieee802_11_auth.c
U src/dist/wpa/hostapd/hostapd.sim_db
U src/dist/wpa/hostapd/hostapd.vlan
U src/dist/wpa/hostapd/hostapd.wpa_psk
U src/dist/wpa/hostapd/hostapd_cli.1
C src/dist/wpa/hostapd/hostapd_cli.c
U src/dist/wpa/hostapd/hw_features.c
U src/dist/wpa/hostapd/hw_features.h
U src/dist/wpa/hostapd/iapp.c
U src/dist/wpa/hostapd/iapp.h
U src/dist/wpa/hostapd/ieee802_11.c
U src/dist/wpa/hostapd/ieee802_11.h
U src/dist/wpa/hostapd/mlme.c
U src/dist/wpa/hostapd/ieee802_11_auth.h
U src/dist/wpa/hostapd/ieee802_11h.c
U src/dist/wpa/hostapd/ieee802_11h.h
U src/dist/wpa/hostapd/ieee802_1x.c
U src/dist/wpa/hostapd/ieee802_1x.h
U src/dist/wpa/hostapd/peerkey.c
U src/dist/wpa/hostapd/mlme.h
U src/dist/wpa/hostapd/priv_netlink.h
U src/dist/wpa/hostapd/nt_password_hash.c
U src/dist/wpa/hostapd/pmksa_cache.c
U src/dist/wpa/hostapd/pmksa_cache.h
U src/dist/wpa/hostapd/preauth.c
U src/dist/wpa/hostapd/preauth.h
U src/dist/wpa/hostapd/prism54.h
N src/dist/wpa/hostapd/radiotap_iter.h
N src/dist/wpa/hostapd/radiotap.c
N src/dist/wpa/hostapd/radiotap.h
U src/dist/wpa/hostapd/wpa_auth_ie.c
U src/dist/wpa/hostapd/reconfig.c
U src/dist/wpa/hostapd/sta_info.c
U src/dist/wpa/hostapd/sta_info.h
U src/dist/wpa/hostapd/vlan_init.c
U src/dist/wpa/hostapd/vlan_init.h
U src/dist/wpa/hostapd/wired.conf
U src/dist/wpa/hostapd/wme.c
U src/dist/wpa/hostapd/wme.h
U src/dist/wpa/hostapd/wpa.c
U src/dist/wpa/hostapd/wpa.h
U src/dist/wpa/hostapd/wpa_auth_i.h
U src/dist/wpa/hostapd/wpa_auth_ie.h
U src/dist/wpa/hostapd/wpa_ft.c
U src/dist/wpa/hostapd/doc/ctrl_iface.doxygen
U src/dist/wpa/hostapd/doc/.gitignore
U src/dist/wpa/hostapd/doc/code_structure.doxygen
U src/dist/wpa/hostapd/doc/doxygen.fast
U src/dist/wpa/hostapd/doc/doxygen.full
U src/dist/wpa/hostapd/doc/driver_wrapper.doxygen
U src/dist/wpa/hostapd/doc/eap.doxygen
U src/dist/wpa/hostapd/doc/hostapd.fig
U src/dist/wpa/hostapd/doc/kerneldoc2doxygen.pl
U src/dist/wpa/hostapd/doc/mainpage.doxygen
U src/dist/wpa/hostapd/doc/porting.doxygen
U src/dist/wpa/hostapd/logwatch/hostapd.conf
U src/dist/wpa/hostapd/logwatch/README
U src/dist/wpa/hostapd/logwatch/hostapd

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

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