From owner-cvs-all@FreeBSD.ORG Wed Jul 11 15:48:44 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7909116A468; Wed, 11 Jul 2007 15:48:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6953F13C469; Wed, 11 Jul 2007 15:48:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BFmiDI035983; Wed, 11 Jul 2007 15:48:44 GMT (envelope-from sam@repoman.freebsd.org) Received: (from sam@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BFmieR035982; Wed, 11 Jul 2007 15:48:44 GMT (envelope-from sam) Message-Id: <200707111548.l6BFmieR035982@repoman.freebsd.org> From: Sam Leffler Date: Wed, 11 Jul 2007 15:48:43 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: MALINEN Cc: Subject: cvs commit: src/contrib/wpa_supplicant - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 15:48:44 -0000 sam 2007-07-11 15:48:43 UTC FreeBSD src repository src/contrib/wpa_supplicant - Imported sources Update of /home/ncvs/src/contrib/wpa_supplicant In directory repoman.freebsd.org:/tmp/cvs-serv35896 Log Message: Import of WPA supplicant 0.5.8 Status: Vendor Tag: MALINEN Release Tags: v0_5_8 U src/contrib/wpa_supplicant/COPYING U src/contrib/wpa_supplicant/ChangeLog C src/contrib/wpa_supplicant/FREEBSD-Xlist C src/contrib/wpa_supplicant/FREEBSD-upgrade U src/contrib/wpa_supplicant/Makefile U src/contrib/wpa_supplicant/README U src/contrib/wpa_supplicant/aes.c U src/contrib/wpa_supplicant/aes_wrap.c U src/contrib/wpa_supplicant/aes_wrap.h U src/contrib/wpa_supplicant/base64.c U src/contrib/wpa_supplicant/base64.h U src/contrib/wpa_supplicant/common.c C src/contrib/wpa_supplicant/common.h U src/contrib/wpa_supplicant/config.c U src/contrib/wpa_supplicant/config.h U src/contrib/wpa_supplicant/config_file.c U src/contrib/wpa_supplicant/config_ssid.h U src/contrib/wpa_supplicant/config_types.h U src/contrib/wpa_supplicant/crypto.c U src/contrib/wpa_supplicant/crypto.h U src/contrib/wpa_supplicant/defconfig U src/contrib/wpa_supplicant/crypto_gnutls.c U src/contrib/wpa_supplicant/ctrl_iface.c U src/contrib/wpa_supplicant/ctrl_iface.h U src/contrib/wpa_supplicant/defs.h U src/contrib/wpa_supplicant/driver.h U src/contrib/wpa_supplicant/driver_hostap.h U src/contrib/wpa_supplicant/driver_ndis.c U src/contrib/wpa_supplicant/driver_ndis.h U src/contrib/wpa_supplicant/driver_wired.c U src/contrib/wpa_supplicant/drivers.c U src/contrib/wpa_supplicant/eap.c U src/contrib/wpa_supplicant/eap.h U src/contrib/wpa_supplicant/eap_aka.c U src/contrib/wpa_supplicant/eap_defs.h U src/contrib/wpa_supplicant/eap_fast.c U src/contrib/wpa_supplicant/eap_gtc.c U src/contrib/wpa_supplicant/eap_i.h U src/contrib/wpa_supplicant/eap_leap.c U src/contrib/wpa_supplicant/eap_md5.c U src/contrib/wpa_supplicant/eap_mschapv2.c U src/contrib/wpa_supplicant/eap_otp.c U src/contrib/wpa_supplicant/eap_pax.c U src/contrib/wpa_supplicant/eap_pax_common.c U src/contrib/wpa_supplicant/eap_pax_common.h U src/contrib/wpa_supplicant/eap_peap.c U src/contrib/wpa_supplicant/eap_psk.c U src/contrib/wpa_supplicant/eap_psk_common.c U src/contrib/wpa_supplicant/eap_psk_common.h U src/contrib/wpa_supplicant/eap_sim.c U src/contrib/wpa_supplicant/eap_sim_common.c U src/contrib/wpa_supplicant/eap_sim_common.h U src/contrib/wpa_supplicant/eap_testing.txt U src/contrib/wpa_supplicant/eap_tls.c U src/contrib/wpa_supplicant/eap_tls_common.c U src/contrib/wpa_supplicant/eap_tls_common.h U src/contrib/wpa_supplicant/eap_tlv.c U src/contrib/wpa_supplicant/eap_tlv.h U src/contrib/wpa_supplicant/eap_ttls.c U src/contrib/wpa_supplicant/eap_ttls.h U src/contrib/wpa_supplicant/eapol_sm.c U src/contrib/wpa_supplicant/eapol_sm.h U src/contrib/wpa_supplicant/eapol_test.c U src/contrib/wpa_supplicant/eloop.c U src/contrib/wpa_supplicant/eloop.h C src/contrib/wpa_supplicant/events.c U src/contrib/wpa_supplicant/main.c U src/contrib/wpa_supplicant/hostapd.h U src/contrib/wpa_supplicant/l2_packet.h U src/contrib/wpa_supplicant/md5.c U src/contrib/wpa_supplicant/md5.h U src/contrib/wpa_supplicant/ms_funcs.c U src/contrib/wpa_supplicant/ms_funcs.h U src/contrib/wpa_supplicant/openssl-tls-extensions.patch U src/contrib/wpa_supplicant/pcsc_funcs.c U src/contrib/wpa_supplicant/pcsc_funcs.h U src/contrib/wpa_supplicant/preauth.c U src/contrib/wpa_supplicant/preauth.h U src/contrib/wpa_supplicant/preauth_test.c U src/contrib/wpa_supplicant/radius.c U src/contrib/wpa_supplicant/radius.h U src/contrib/wpa_supplicant/radius_client.c U src/contrib/wpa_supplicant/radius_client.h U src/contrib/wpa_supplicant/rc4.c U src/contrib/wpa_supplicant/rc4.h U src/contrib/wpa_supplicant/sha1.c U src/contrib/wpa_supplicant/sha1.h U src/contrib/wpa_supplicant/tls.h U src/contrib/wpa_supplicant/tls_gnutls.c U src/contrib/wpa_supplicant/tls_none.c U src/contrib/wpa_supplicant/tls_openssl.c U src/contrib/wpa_supplicant/tls_schannel.c U src/contrib/wpa_supplicant/todo.txt U src/contrib/wpa_supplicant/version.h U src/contrib/wpa_supplicant/wpa.c U src/contrib/wpa_supplicant/wpa.h U src/contrib/wpa_supplicant/wpa_cli.c C src/contrib/wpa_supplicant/wpa_ctrl.c U src/contrib/wpa_supplicant/wpa_ctrl.h U src/contrib/wpa_supplicant/wpa_i.h U src/contrib/wpa_supplicant/wpa_passphrase.c C src/contrib/wpa_supplicant/wpa_supplicant.c U src/contrib/wpa_supplicant/wpa_supplicant.conf U src/contrib/wpa_supplicant/wpa_supplicant.h U src/contrib/wpa_supplicant/wpa_supplicant_i.h N src/contrib/wpa_supplicant/wpa_common.h N src/contrib/wpa_supplicant/tlsv1_common.h N src/contrib/wpa_supplicant/tlsv1_common.c N src/contrib/wpa_supplicant/tlsv1_client.h N src/contrib/wpa_supplicant/tlsv1_client.c N src/contrib/wpa_supplicant/tls_internal.c N src/contrib/wpa_supplicant/state_machine.h N src/contrib/wpa_supplicant/sha256.h N src/contrib/wpa_supplicant/sha256.c N src/contrib/wpa_supplicant/rsa.h N src/contrib/wpa_supplicant/rsa.c N src/contrib/wpa_supplicant/pmksa_cache.h N src/contrib/wpa_supplicant/pmksa_cache.c N src/contrib/wpa_supplicant/os_unix.c N src/contrib/wpa_supplicant/os_none.c N src/contrib/wpa_supplicant/os_internal.c N src/contrib/wpa_supplicant/os.h N src/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch N src/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch N src/contrib/wpa_supplicant/nmake.mak N src/contrib/wpa_supplicant/mlme.h N src/contrib/wpa_supplicant/mlme.c N src/contrib/wpa_supplicant/md4.c N src/contrib/wpa_supplicant/libtommath.c N src/contrib/wpa_supplicant/includes.h N src/contrib/wpa_supplicant/eloop_win.c N src/contrib/wpa_supplicant/eap_sake.c N src/contrib/wpa_supplicant/eloop_none.c N src/contrib/wpa_supplicant/eap_vendor_test.c N src/contrib/wpa_supplicant/eap_sake_common.h N src/contrib/wpa_supplicant/eap_sake_common.c N src/contrib/wpa_supplicant/eap_methods.h N src/contrib/wpa_supplicant/eap_methods.c N src/contrib/wpa_supplicant/eap_gpsk_common.h N src/contrib/wpa_supplicant/eap_gpsk_common.c N src/contrib/wpa_supplicant/eap_gpsk.c N src/contrib/wpa_supplicant/des.c N src/contrib/wpa_supplicant/dbus_dict_helpers.h N src/contrib/wpa_supplicant/dbus_dict_helpers.c N src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf N src/contrib/wpa_supplicant/ctrl_iface_unix.c N src/contrib/wpa_supplicant/ctrl_iface_udp.c N src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c N src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h N src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c N src/contrib/wpa_supplicant/ctrl_iface_dbus.h N src/contrib/wpa_supplicant/ctrl_iface_dbus.c N src/contrib/wpa_supplicant/crypto_none.c N src/contrib/wpa_supplicant/crypto_libtomcrypt.c N src/contrib/wpa_supplicant/crypto_internal.c N src/contrib/wpa_supplicant/crypto_cryptoapi.c N src/contrib/wpa_supplicant/config_winreg.c N src/contrib/wpa_supplicant/config_none.c N src/contrib/wpa_supplicant/build_config.h N src/contrib/wpa_supplicant/bignum.h N src/contrib/wpa_supplicant/bignum.c N src/contrib/wpa_supplicant/asn1_test.c N src/contrib/wpa_supplicant/asn1.h N src/contrib/wpa_supplicant/asn1.c N src/contrib/wpa_supplicant/aes.h N src/contrib/wpa_supplicant/x509v3.h N src/contrib/wpa_supplicant/x509v3.c U src/contrib/wpa_supplicant/doc/code_structure.doxygen U src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen U src/contrib/wpa_supplicant/doc/doxygen.fast U src/contrib/wpa_supplicant/doc/doxygen.full U src/contrib/wpa_supplicant/doc/driver_wrapper.doxygen U src/contrib/wpa_supplicant/doc/eap.doxygen U src/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl U src/contrib/wpa_supplicant/doc/mainpage.doxygen U src/contrib/wpa_supplicant/doc/porting.doxygen U src/contrib/wpa_supplicant/doc/testing_tools.doxygen U src/contrib/wpa_supplicant/doc/wpa_supplicant.fig U src/contrib/wpa_supplicant/doc/docbook/Makefile U src/contrib/wpa_supplicant/doc/docbook/wpa_background.8 U src/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml U src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8 U src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml U src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8 U src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml U src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8 U src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 U src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml U src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml U src/contrib/wpa_supplicant/examples/ieee8021x.conf U src/contrib/wpa_supplicant/examples/plaintext.conf U src/contrib/wpa_supplicant/examples/wep.conf U src/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf U src/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf U src/contrib/wpa_supplicant/wpa_gui/eventhistory.ui U src/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h U src/contrib/wpa_supplicant/wpa_gui/main.cpp U src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui U src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h U src/contrib/wpa_supplicant/wpa_gui/scanresults.ui U src/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h U src/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui U src/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h U src/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro U src/contrib/wpa_supplicant/wpa_gui/wpagui.ui U src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h U src/contrib/wpa_supplicant/wpa_gui/wpamsg.h N src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling N src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h U src/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui U src/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp U src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui U src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui U src/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling U src/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui U src/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro U src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui U src/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h N src/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp N src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp N src/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h N src/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp N src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h N src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp N src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h N src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp N src/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h 6 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMALINEN:yesterday -jMALINEN src/contrib/wpa_supplicant