~ubuntu-branches/ubuntu/saucy/wpasupplicant/saucy

Viewing changes to src/ap/wpa_auth_glue.c

Committer: Bazaar Package Importer
Author(s): Mathieu Trudel-Lapierre
Date: 2010-11-22 09:43:43 UTC
mfrom: (1.1.16 upstream)
Revision ID: james.westby@ubuntu.com-20101122094343-qgsxaojvmswfri77

Tags: 0.7.3-0ubuntu1

* Get wpasupplicant 0.7.3 from Debian's SVN. Leaving 0.7.3-1 as unreleased
for now.
* Build-Depend on debhelper 8, since the packaging from Debian uses compat 8.

files added:
.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus

.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus/dbus-wpa_supplicant.conf

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service

debian/wpasupplicant.lintian-overrides

src/ap

src/ap/Makefile

src/ap/accounting.c

src/ap/accounting.h

src/ap/ap_config.c

src/ap/ap_config.h

src/ap/ap_drv_ops.c

src/ap/ap_drv_ops.h

src/ap/ap_list.c

src/ap/ap_list.h

src/ap/ap_mlme.c

src/ap/ap_mlme.h

src/ap/authsrv.c

src/ap/authsrv.h

src/ap/beacon.c

src/ap/beacon.h

src/ap/ctrl_iface_ap.c

src/ap/ctrl_iface_ap.h

src/ap/drv_callbacks.c

src/ap/hostapd.c

src/ap/hostapd.h

src/ap/hw_features.c

src/ap/hw_features.h

src/ap/iapp.c

src/ap/iapp.h

src/ap/ieee802_11.c

src/ap/ieee802_11.h

src/ap/ieee802_11_auth.c

src/ap/ieee802_11_auth.h

src/ap/ieee802_11_ht.c

src/ap/ieee802_1x.c

src/ap/ieee802_1x.h

src/ap/peerkey_auth.c

src/ap/pmksa_cache_auth.c

src/ap/pmksa_cache_auth.h

src/ap/preauth_auth.c

src/ap/preauth_auth.h

src/ap/sta_info.c

src/ap/sta_info.h

src/ap/tkip_countermeasures.c

src/ap/tkip_countermeasures.h

src/ap/utils.c

src/ap/vlan_init.c

src/ap/vlan_init.h

src/ap/wmm.c

src/ap/wmm.h

src/ap/wpa_auth.c

src/ap/wpa_auth.h

src/ap/wpa_auth_ft.c

src/ap/wpa_auth_glue.c

src/ap/wpa_auth_glue.h

src/ap/wpa_auth_i.h

src/ap/wpa_auth_ie.c

src/ap/wpa_auth_ie.h

src/ap/wps_hostapd.c

src/ap/wps_hostapd.h

src/crypto/.gitignore

src/crypto/aes-cbc.c

src/crypto/aes-ctr.c

src/crypto/aes-eax.c

src/crypto/aes-encblock.c

src/crypto/aes-internal-dec.c

src/crypto/aes-internal-enc.c

src/crypto/aes-internal.c

src/crypto/aes-omac1.c

src/crypto/aes-unwrap.c

src/crypto/aes-wrap.c

src/crypto/aes_i.h

src/crypto/crypto_internal-cipher.c

src/crypto/crypto_internal-modexp.c

src/crypto/crypto_internal-rsa.c

src/crypto/crypto_nss.c

src/crypto/des-internal.c

src/crypto/des_i.h

src/crypto/dh_group5.c

src/crypto/dh_group5.h

src/crypto/fips_prf_cryptoapi.c

src/crypto/fips_prf_gnutls.c

src/crypto/fips_prf_internal.c

src/crypto/fips_prf_nss.c

src/crypto/fips_prf_openssl.c

src/crypto/md4-internal.c

src/crypto/md5-internal.c

src/crypto/md5-non-fips.c

src/crypto/md5_i.h

src/crypto/milenage.c

src/crypto/milenage.h

src/crypto/sha1-internal.c

src/crypto/sha1-pbkdf2.c

src/crypto/sha1-tlsprf.c

src/crypto/sha1-tprf.c

src/crypto/sha1_i.h

src/crypto/sha256-internal.c

src/crypto/tls_nss.c

src/drivers/.gitignore

src/drivers/driver_atheros.c

src/drivers/driver_none.c

src/drivers/drivers.mak

src/drivers/linux_ioctl.c

src/drivers/linux_ioctl.h

src/drivers/netlink.c

src/drivers/netlink.h

src/drivers/nl80211_copy.h

src/drivers/wireless_copy.h

src/eap_server/eap_server.c

src/eap_server/eap_server_aka.c

src/eap_server/eap_server_fast.c

src/eap_server/eap_server_gpsk.c

src/eap_server/eap_server_gtc.c

src/eap_server/eap_server_identity.c

src/eap_server/eap_server_ikev2.c

src/eap_server/eap_server_md5.c

src/eap_server/eap_server_methods.c

src/eap_server/eap_server_mschapv2.c

src/eap_server/eap_server_pax.c

src/eap_server/eap_server_peap.c

src/eap_server/eap_server_psk.c

src/eap_server/eap_server_sake.c

src/eap_server/eap_server_sim.c

src/eap_server/eap_server_tls.c

src/eap_server/eap_server_tls_common.c

src/eap_server/eap_server_tnc.c

src/eap_server/eap_server_ttls.c

src/eap_server/eap_server_vendor_test.c

src/eap_server/eap_server_wsc.c

src/eapol_auth

src/eapol_auth/Makefile

src/eapol_auth/eapol_auth_dump.c

src/eapol_auth/eapol_auth_sm.c

src/eapol_auth/eapol_auth_sm.h

src/eapol_auth/eapol_auth_sm_i.h

src/lib.rules

src/radius/.gitignore

src/tls/.gitignore

src/tls/pkcs1.c

src/tls/pkcs1.h

src/tls/pkcs5.c

src/tls/pkcs5.h

src/tls/pkcs8.c

src/tls/pkcs8.h

src/utils/.gitignore

src/utils/list.h

src/utils/radiotap.c

src/utils/radiotap.h

src/utils/radiotap_iter.h

src/utils/trace.c

src/utils/trace.h

src/wps/http.h

src/wps/http_client.c

src/wps/http_client.h

src/wps/http_server.c

src/wps/http_server.h

src/wps/ndef.c

src/wps/upnp_xml.c

src/wps/upnp_xml.h

src/wps/wps_er.c

src/wps/wps_er.h

src/wps/wps_er_ssdp.c

src/wps/wps_nfc.c

src/wps/wps_nfc_pn531.c

src/wps/wps_ufd.c

src/wps/wps_upnp_ap.c

wpa_supplicant/ap.c

wpa_supplicant/ap.h

wpa_supplicant/bgscan.c

wpa_supplicant/bgscan.h

wpa_supplicant/bgscan_simple.c

wpa_supplicant/bss.c

wpa_supplicant/bss.h

wpa_supplicant/dbus

wpa_supplicant/dbus/.gitignore

wpa_supplicant/dbus/Makefile

wpa_supplicant/dbus/dbus-wpa_supplicant.conf

wpa_supplicant/dbus/dbus_common.c

wpa_supplicant/dbus/dbus_common.h

wpa_supplicant/dbus/dbus_common_i.h

wpa_supplicant/dbus/dbus_dict_helpers.c

wpa_supplicant/dbus/dbus_dict_helpers.h

wpa_supplicant/dbus/dbus_new.c

wpa_supplicant/dbus/dbus_new.h

wpa_supplicant/dbus/dbus_new_handlers.c

wpa_supplicant/dbus/dbus_new_handlers.h

wpa_supplicant/dbus/dbus_new_handlers_wps.c

wpa_supplicant/dbus/dbus_new_helpers.c

wpa_supplicant/dbus/dbus_new_helpers.h

wpa_supplicant/dbus/dbus_new_introspect.c

wpa_supplicant/dbus/dbus_old.c

wpa_supplicant/dbus/dbus_old.h

wpa_supplicant/dbus/dbus_old_handlers.c

wpa_supplicant/dbus/dbus_old_handlers.h

wpa_supplicant/dbus/dbus_old_handlers_wps.c

wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service

wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service

wpa_supplicant/driver_i.h

wpa_supplicant/eap_register.c

wpa_supplicant/examples/60_wpa_supplicant

wpa_supplicant/examples/wpas-dbus-new-getall.py

wpa_supplicant/examples/wpas-dbus-new-signals.py

wpa_supplicant/examples/wpas-dbus-new-wps.py

wpa_supplicant/examples/wpas-dbus-new.py

wpa_supplicant/ibss_rsn.c

wpa_supplicant/ibss_rsn.h

wpa_supplicant/notify.c

wpa_supplicant/notify.h

wpa_supplicant/scan.h

wpa_supplicant/sme.c

wpa_supplicant/sme.h

wpa_supplicant/wpa_gui-qt4/icons/ap.svg

wpa_supplicant/wpa_gui-qt4/icons/laptop.svg

wpa_supplicant/wpa_gui-qt4/lang

wpa_supplicant/wpa_gui-qt4/lang/.gitignore

wpa_supplicant/wpa_gui-qt4/lang/wpa_gui_de.ts

wpa_supplicant/wpa_gui-qt4/peers.cpp

wpa_supplicant/wpa_gui-qt4/peers.h

wpa_supplicant/wpa_gui-qt4/peers.ui

wpa_supplicant/wpa_gui-qt4/stringquery.cpp

wpa_supplicant/wpa_gui-qt4/stringquery.h

wpa_supplicant/xcode

wpa_supplicant/xcode/wpa_supplicant.xcodeproj

wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj

files removed:
.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus-wpa_supplicant.conf

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus-wpa_supplicant.service

.pc/11_syslog.patch

.pc/11_syslog.patch/src

.pc/11_syslog.patch/src/utils

.pc/11_syslog.patch/src/utils/wpa_debug.c

.pc/11_syslog.patch/src/utils/wpa_debug.h

.pc/11_syslog.patch/wpa_supplicant

.pc/11_syslog.patch/wpa_supplicant/Makefile

.pc/11_syslog.patch/wpa_supplicant/main.c

.pc/11_syslog.patch/wpa_supplicant/wpa_supplicant.c

.pc/11_syslog.patch/wpa_supplicant/wpa_supplicant_i.h

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant/wpa_gui-qt4

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant/wpa_gui-qt4/wpagui.cpp

.pc/20_wpa_msg_ctrl_wps.patch

.pc/20_wpa_msg_ctrl_wps.patch/wpa_supplicant

.pc/20_wpa_msg_ctrl_wps.patch/wpa_supplicant/wps_supplicant.c

.pc/21_kfreebsd.patch

.pc/21_kfreebsd.patch/src

.pc/21_kfreebsd.patch/src/drivers

.pc/21_kfreebsd.patch/src/drivers/driver_bsd.c

.pc/21_kfreebsd.patch/src/drivers/driver_wired.c

.pc/21_kfreebsd.patch/src/l2_packet

.pc/21_kfreebsd.patch/src/l2_packet/l2_packet_freebsd.c

.pc/21_kfreebsd.patch/src/utils

.pc/21_kfreebsd.patch/src/utils/common.h

.pc/21_kfreebsd.patch/src/wps

.pc/21_kfreebsd.patch/src/wps/wps_upnp.c

.pc/21_kfreebsd.patch/wpa_supplicant

.pc/21_kfreebsd.patch/wpa_supplicant/ctrl_iface_unix.c

.pc/30_cfg80211_association_optimisation.patch

.pc/30_cfg80211_association_optimisation.patch/src

.pc/30_cfg80211_association_optimisation.patch/src/drivers

.pc/30_cfg80211_association_optimisation.patch/src/drivers/driver_wext.c

.pc/30_cfg80211_association_optimisation.patch/src/drivers/driver_wext.h

src/common/nl80211_copy.h

src/common/wireless_copy.h

src/crypto/aes.c

src/crypto/aes_wrap.c

src/crypto/des.c

src/crypto/md4.c

src/crypto/rc4.h

src/drivers/driver_prism54.c

src/drivers/driver_ps3.c

src/drivers/radiotap.c

src/drivers/radiotap.h

src/drivers/radiotap_iter.h

src/drivers/scan_helpers.c

src/eap_server/eap.c

src/eap_server/eap_aka.c

src/eap_server/eap_fast.c

src/eap_server/eap_gpsk.c

src/eap_server/eap_gtc.c

src/eap_server/eap_identity.c

src/eap_server/eap_ikev2.c

src/eap_server/eap_md5.c

src/eap_server/eap_methods.c

src/eap_server/eap_mschapv2.c

src/eap_server/eap_pax.c

src/eap_server/eap_peap.c

src/eap_server/eap_psk.c

src/eap_server/eap_sake.c

src/eap_server/eap_sim.c

src/eap_server/eap_tls.c

src/eap_server/eap_tls_common.c

src/eap_server/eap_tnc.c

src/eap_server/eap_ttls.c

src/eap_server/eap_vendor_test.c

src/eap_server/eap_wsc.c

src/hlr_auc_gw

src/hlr_auc_gw/Makefile

src/hlr_auc_gw/hlr_auc_gw.c

src/hlr_auc_gw/hlr_auc_gw.milenage_db

src/hlr_auc_gw/milenage.c

src/hlr_auc_gw/milenage.h

src/tls/asn1_test.c

wpa_supplicant/ctrl_iface_dbus.c

wpa_supplicant/ctrl_iface_dbus.h

wpa_supplicant/ctrl_iface_dbus_handlers.c

wpa_supplicant/ctrl_iface_dbus_handlers.h

wpa_supplicant/dbus-wpa_supplicant.conf

wpa_supplicant/dbus-wpa_supplicant.service

wpa_supplicant/dbus_dict_helpers.c

wpa_supplicant/dbus_dict_helpers.h

wpa_supplicant/doc/.gitignore

wpa_supplicant/doc/code_structure.doxygen

wpa_supplicant/doc/ctrl_iface.doxygen

wpa_supplicant/doc/doxygen.fast

wpa_supplicant/doc/doxygen.full

wpa_supplicant/doc/driver_wrapper.doxygen

wpa_supplicant/doc/eap.doxygen

wpa_supplicant/doc/kerneldoc2doxygen.pl

wpa_supplicant/doc/mainpage.doxygen

wpa_supplicant/doc/porting.doxygen

wpa_supplicant/doc/testing_tools.doxygen

wpa_supplicant/doc/wpa_supplicant.fig

wpa_supplicant/tests/test_aes.c

wpa_supplicant/tests/test_md4.c

wpa_supplicant/tests/test_md5.c

wpa_supplicant/tests/test_ms_funcs.c

wpa_supplicant/tests/test_sha1.c

wpa_supplicant/tests/test_sha256.c

wpa_supplicant/tests/test_x509v3.c

wpa_supplicant/tests/test_x509v3_nist.sh

wpa_supplicant/tests/test_x509v3_nist2.sh

files modified:
.pc/01_use_pkg-config_for_pcsc-lite_module.patch/wpa_supplicant/Makefile

.pc/applied-patches

debian/changelog

debian/compat

debian/config/kfreebsd

debian/config/linux

debian/control

debian/copyright

debian/ifupdown/action_wpa.sh

debian/ifupdown/functions.sh

debian/ifupdown/wpa_action

debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch

debian/patches/02_dbus_group_policy.patch

debian/patches/07_dbus_service_syslog.patch

debian/patches/series

debian/rules

debian/watch

debian/wpasupplicant.links

src/Makefile

src/common/Makefile

src/common/defs.h

src/common/ieee802_11_common.c

src/common/ieee802_11_common.h

src/common/ieee802_11_defs.h

src/common/privsep_commands.h

src/common/version.h

src/common/wpa_common.c

src/common/wpa_common.h

src/common/wpa_ctrl.h

src/crypto/Makefile

src/crypto/aes.h

src/crypto/crypto.h

src/crypto/crypto_cryptoapi.c

src/crypto/crypto_gnutls.c

src/crypto/crypto_internal.c

src/crypto/crypto_libtomcrypt.c

src/crypto/crypto_none.c

src/crypto/crypto_openssl.c

src/crypto/dh_groups.c

src/crypto/md5.c

src/crypto/md5.h

src/crypto/ms_funcs.c

src/crypto/ms_funcs.h

src/crypto/rc4.c

src/crypto/sha1.c

src/crypto/sha1.h

src/crypto/sha256.c

src/crypto/tls.h

src/crypto/tls_gnutls.c

src/crypto/tls_internal.c

src/crypto/tls_none.c

src/crypto/tls_openssl.c

src/crypto/tls_schannel.c

src/drivers/Makefile

src/drivers/driver.h

src/drivers/driver_atmel.c

src/drivers/driver_broadcom.c

src/drivers/driver_bsd.c

src/drivers/driver_hostap.c

src/drivers/driver_hostap.h

src/drivers/driver_iphone.m

src/drivers/driver_ipw.c

src/drivers/driver_madwifi.c

src/drivers/driver_ndis.c

src/drivers/driver_ndis.h

src/drivers/driver_ndiswrapper.c

src/drivers/driver_nl80211.c

src/drivers/driver_osx.m

src/drivers/driver_privsep.c

src/drivers/driver_ralink.c

src/drivers/driver_ralink.h

src/drivers/driver_roboswitch.c

src/drivers/driver_test.c

src/drivers/driver_wext.c

src/drivers/driver_wext.h

src/drivers/driver_wired.c

src/drivers/drivers.c

src/drivers/priv_netlink.h

src/eap_common/Makefile

src/eap_common/chap.c

src/eap_common/chap.h

src/eap_common/eap_fast_common.c

src/eap_common/eap_gpsk_common.c

src/eap_common/eap_pax_common.c

src/eap_common/eap_peap_common.c

src/eap_common/eap_psk_common.c

src/eap_common/eap_sake_common.c

src/eap_common/eap_sim_common.c

src/eap_common/eap_sim_common.h

src/eap_common/ikev2_common.c

src/eap_peer/Makefile

src/eap_peer/eap.c

src/eap_peer/eap.h

src/eap_peer/eap_aka.c

src/eap_peer/eap_config.h

src/eap_peer/eap_fast.c

src/eap_peer/eap_fast_pac.c

src/eap_peer/eap_leap.c

src/eap_peer/eap_md5.c

src/eap_peer/eap_methods.c

src/eap_peer/eap_methods.h

src/eap_peer/eap_mschapv2.c

src/eap_peer/eap_pax.c

src/eap_peer/eap_peap.c

src/eap_peer/eap_psk.c

src/eap_peer/eap_sim.c

src/eap_peer/eap_tls.c

src/eap_peer/eap_tls_common.c

src/eap_peer/eap_tls_common.h

src/eap_peer/eap_tnc.c

src/eap_peer/eap_ttls.c

src/eap_peer/eap_wsc.c

src/eap_peer/ikev2.c

src/eap_peer/mschapv2.c

src/eap_peer/mschapv2.h

src/eap_server/Makefile

src/eap_server/eap.h

src/eap_server/eap_i.h

src/eap_server/eap_methods.h

src/eap_server/eap_sim_db.c

src/eap_server/eap_sim_db.h

src/eap_server/eap_tls_common.h

src/eap_server/ikev2.c

src/eap_server/tncs.c

src/eapol_supp/Makefile

src/eapol_supp/eapol_supp_sm.c

src/eapol_supp/eapol_supp_sm.h

src/l2_packet/Makefile

src/l2_packet/l2_packet_ndis.c

src/l2_packet/l2_packet_privsep.c

src/radius/Makefile

src/radius/radius.c

src/radius/radius.h

src/radius/radius_client.c

src/radius/radius_client.h

src/radius/radius_server.c

src/radius/radius_server.h

src/rsn_supp/Makefile

src/rsn_supp/peerkey.c

src/rsn_supp/pmksa_cache.c

src/rsn_supp/pmksa_cache.h

src/rsn_supp/preauth.c

src/rsn_supp/preauth.h

src/rsn_supp/wpa.c

src/rsn_supp/wpa.h

src/rsn_supp/wpa_ft.c

src/rsn_supp/wpa_i.h

src/rsn_supp/wpa_ie.c

src/rsn_supp/wpa_ie.h

src/tls/Makefile

src/tls/asn1.c

src/tls/asn1.h

src/tls/rsa.c

src/tls/tlsv1_client.c

src/tls/tlsv1_client_read.c

src/tls/tlsv1_client_write.c

src/tls/tlsv1_common.h

src/tls/tlsv1_cred.c

src/tls/tlsv1_record.c

src/tls/tlsv1_record.h

src/tls/tlsv1_server.c

src/tls/tlsv1_server_read.c

src/tls/tlsv1_server_write.c

src/tls/x509v3.c

src/tls/x509v3.h

src/utils/Makefile

src/utils/base64.c

src/utils/build_config.h

src/utils/common.c

src/utils/common.h

src/utils/eloop.c

src/utils/eloop.h

src/utils/eloop_none.c

src/utils/eloop_win.c

src/utils/ip_addr.h

src/utils/os.h

src/utils/os_internal.c

src/utils/os_unix.c

src/utils/uuid.c

src/utils/uuid.h

src/utils/wpa_debug.c

src/utils/wpabuf.c

src/utils/wpabuf.h

src/wps/Makefile

src/wps/httpread.c

src/wps/httpread.h

src/wps/wps.c

src/wps/wps.h

src/wps/wps_attr_build.c

src/wps/wps_attr_parse.c

src/wps/wps_attr_process.c

src/wps/wps_common.c

src/wps/wps_defs.h

src/wps/wps_dev_attr.c

src/wps/wps_enrollee.c

src/wps/wps_i.h

src/wps/wps_registrar.c

src/wps/wps_upnp.c

src/wps/wps_upnp.h

src/wps/wps_upnp_event.c

src/wps/wps_upnp_i.h

src/wps/wps_upnp_ssdp.c

src/wps/wps_upnp_web.c

wpa_supplicant/ChangeLog

wpa_supplicant/Makefile

wpa_supplicant/README

wpa_supplicant/README-WPS

wpa_supplicant/config.c

wpa_supplicant/config.h

wpa_supplicant/config_file.c

wpa_supplicant/config_ssid.h

wpa_supplicant/config_winreg.c

wpa_supplicant/ctrl_iface.c

wpa_supplicant/ctrl_iface_named_pipe.c

wpa_supplicant/ctrl_iface_udp.c

wpa_supplicant/ctrl_iface_unix.c

wpa_supplicant/defconfig

wpa_supplicant/doc/docbook/wpa_background.8

wpa_supplicant/doc/docbook/wpa_cli.8

wpa_supplicant/doc/docbook/wpa_gui.8

wpa_supplicant/doc/docbook/wpa_passphrase.8

wpa_supplicant/doc/docbook/wpa_priv.8

wpa_supplicant/doc/docbook/wpa_supplicant.8

wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

wpa_supplicant/doc/docbook/wpa_supplicant.sgml

wpa_supplicant/eapol_test.c

wpa_supplicant/events.c

wpa_supplicant/main.c

wpa_supplicant/mlme.c

wpa_supplicant/mlme.h

wpa_supplicant/nmake.mak

wpa_supplicant/preauth_test.c

wpa_supplicant/scan.c

wpa_supplicant/symbian/wpa_supplicant.mmp

wpa_supplicant/tests/test_eap_sim_common.c

wpa_supplicant/tests/test_wpa.c

wpa_supplicant/todo.txt

wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj

wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj

wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj

wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj

wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj

wpa_supplicant/wpa_cli.c

wpa_supplicant/wpa_gui-qt4/addinterface.cpp

wpa_supplicant/wpa_gui-qt4/eventhistory.cpp

wpa_supplicant/wpa_gui-qt4/icons.qrc

wpa_supplicant/wpa_gui-qt4/icons/Makefile

wpa_supplicant/wpa_gui-qt4/icons/README

wpa_supplicant/wpa_gui-qt4/icons_png.qrc

wpa_supplicant/wpa_gui-qt4/main.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.ui

wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp

wpa_supplicant/wpa_gui-qt4/wpa_gui.pro

wpa_supplicant/wpa_gui-qt4/wpagui.cpp

wpa_supplicant/wpa_gui-qt4/wpagui.h

wpa_supplicant/wpa_gui-qt4/wpagui.ui

wpa_supplicant/wpa_gui/scanresults.ui

wpa_supplicant/wpa_gui/userdatarequest.ui

wpa_supplicant/wpa_gui/wpa_gui.pro

wpa_supplicant/wpa_gui/wpagui.ui

wpa_supplicant/wpa_passphrase.c

wpa_supplicant/wpa_priv.c

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.conf

wpa_supplicant/wpa_supplicant.nsi

wpa_supplicant/wpa_supplicant_i.h

wpa_supplicant/wpas_glue.c

wpa_supplicant/wps_supplicant.c

wpa_supplicant/wps_supplicant.h

Show diffs side-by-side

added added

removed removed

src/ap/wpa_auth_glue.c

* hostapd / WPA authenticator glue code

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 as

* published by the Free Software Foundation.

* Alternatively, this software may be distributed under the terms of BSD

* license.

* See README and COPYING for more details.

#include "utils/includes.h"

#include "utils/common.h"

#include "common/ieee802_11_defs.h"

#include "eapol_auth/eapol_auth_sm.h"

#include "eapol_auth/eapol_auth_sm_i.h"

#include "eap_server/eap.h"

#include "l2_packet/l2_packet.h"

#include "drivers/driver.h"

#include "hostapd.h"

#include "ieee802_1x.h"

#include "preauth_auth.h"

#include "sta_info.h"

#include "tkip_countermeasures.h"

#include "ap_drv_ops.h"

#include "ap_config.h"

#include "wpa_auth.h"

#ifdef CONFIG_IEEE80211R

static void hostapd_rrb_receive(void *ctx, const u8 *src_addr, const u8 *buf,

size_t len);

#endif /* CONFIG_IEEE80211R */

static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,

struct wpa_auth_config *wconf)

{

wconf->wpa = conf->wpa;

wconf->wpa_key_mgmt = conf->wpa_key_mgmt;

wconf->wpa_pairwise = conf->wpa_pairwise;

wconf->wpa_group = conf->wpa_group;

wconf->wpa_group_rekey = conf->wpa_group_rekey;

wconf->wpa_strict_rekey = conf->wpa_strict_rekey;

wconf->wpa_gmk_rekey = conf->wpa_gmk_rekey;

wconf->wpa_ptk_rekey = conf->wpa_ptk_rekey;

wconf->rsn_pairwise = conf->rsn_pairwise;

wconf->rsn_preauth = conf->rsn_preauth;

wconf->eapol_version = conf->eapol_version;

wconf->peerkey = conf->peerkey;

wconf->wmm_enabled = conf->wmm_enabled;

wconf->wmm_uapsd = conf->wmm_uapsd;

wconf->okc = conf->okc;

#ifdef CONFIG_IEEE80211W

wconf->ieee80211w = conf->ieee80211w;

#endif /* CONFIG_IEEE80211W */

#ifdef CONFIG_IEEE80211R

wconf->ssid_len = conf->ssid.ssid_len;

if (wconf->ssid_len > SSID_LEN)

wconf->ssid_len = SSID_LEN;

os_memcpy(wconf->ssid, conf->ssid.ssid, wconf->ssid_len);

os_memcpy(wconf->mobility_domain, conf->mobility_domain,

MOBILITY_DOMAIN_ID_LEN);

if (conf->nas_identifier &&

os_strlen(conf->nas_identifier) <= FT_R0KH_ID_MAX_LEN) {

wconf->r0_key_holder_len = os_strlen(conf->nas_identifier);

os_memcpy(wconf->r0_key_holder, conf->nas_identifier,

wconf->r0_key_holder_len);

}

os_memcpy(wconf->r1_key_holder, conf->r1_key_holder, FT_R1KH_ID_LEN);

wconf->r0_key_lifetime = conf->r0_key_lifetime;

wconf->reassociation_deadline = conf->reassociation_deadline;

wconf->r0kh_list = conf->r0kh_list;

wconf->r1kh_list = conf->r1kh_list;

wconf->pmk_r1_push = conf->pmk_r1_push;

#endif /* CONFIG_IEEE80211R */

}

static void hostapd_wpa_auth_logger(void *ctx, const u8 *addr,

logger_level level, const char *txt)

{

#ifndef CONFIG_NO_HOSTAPD_LOGGER

struct hostapd_data *hapd = ctx;

int hlevel;

switch (level) {

case LOGGER_WARNING:

hlevel = HOSTAPD_LEVEL_WARNING;

break;

case LOGGER_INFO:

hlevel = HOSTAPD_LEVEL_INFO;

break;

case LOGGER_DEBUG:

default:

100

hlevel = HOSTAPD_LEVEL_DEBUG;

101

break;

102

}

103

104

hostapd_logger(hapd, addr, HOSTAPD_MODULE_WPA, hlevel, "%s", txt);

105

#endif /* CONFIG_NO_HOSTAPD_LOGGER */

106

}

107

108

109

static void hostapd_wpa_auth_disconnect(void *ctx, const u8 *addr,

110

u16 reason)

111

{

112

struct hostapd_data *hapd = ctx;

113

wpa_printf(MSG_DEBUG, "%s: WPA authenticator requests disconnect: "

114

"STA " MACSTR " reason %d",

115

__func__, MAC2STR(addr), reason);

116

ap_sta_disconnect(hapd, NULL, addr, reason);

117

}

118

119

120

static void hostapd_wpa_auth_mic_failure_report(void *ctx, const u8 *addr)

121

{

122

struct hostapd_data *hapd = ctx;

123

michael_mic_failure(hapd, addr, 0);

124

}

125

126

127

static void hostapd_wpa_auth_set_eapol(void *ctx, const u8 *addr,

128

wpa_eapol_variable var, int value)

129

{

130

struct hostapd_data *hapd = ctx;

131

struct sta_info *sta = ap_get_sta(hapd, addr);

132

if (sta == NULL)

133

return;

134

switch (var) {

135

case WPA_EAPOL_portEnabled:

136

ieee802_1x_notify_port_enabled(sta->eapol_sm, value);

137

break;

138

case WPA_EAPOL_portValid:

139

ieee802_1x_notify_port_valid(sta->eapol_sm, value);

140

break;

141

case WPA_EAPOL_authorized:

142

ieee802_1x_set_sta_authorized(hapd, sta, value);

143

break;

144

case WPA_EAPOL_portControl_Auto:

145

if (sta->eapol_sm)

146

sta->eapol_sm->portControl = Auto;

147

break;

148

case WPA_EAPOL_keyRun:

149

if (sta->eapol_sm)

150

sta->eapol_sm->keyRun = value ? TRUE : FALSE;

151

break;

152

case WPA_EAPOL_keyAvailable:

153

if (sta->eapol_sm)

154

sta->eapol_sm->eap_if->eapKeyAvailable =

155

value ? TRUE : FALSE;

156

break;

157

case WPA_EAPOL_keyDone:

158

if (sta->eapol_sm)

159

sta->eapol_sm->keyDone = value ? TRUE : FALSE;

160

break;

161

case WPA_EAPOL_inc_EapolFramesTx:

162

if (sta->eapol_sm)

163

sta->eapol_sm->dot1xAuthEapolFramesTx++;

164

break;

165

}

166

}

167

168

169

static int hostapd_wpa_auth_get_eapol(void *ctx, const u8 *addr,

170

wpa_eapol_variable var)

171

{

172

struct hostapd_data *hapd = ctx;

173

struct sta_info *sta = ap_get_sta(hapd, addr);

174

if (sta == NULL || sta->eapol_sm == NULL)

175

return -1;

176

switch (var) {

177

case WPA_EAPOL_keyRun:

178

return sta->eapol_sm->keyRun;

179

case WPA_EAPOL_keyAvailable:

180

return sta->eapol_sm->eap_if->eapKeyAvailable;

181

default:

182

return -1;

183

}

184

}

185

186

187

static const u8 * hostapd_wpa_auth_get_psk(void *ctx, const u8 *addr,

188

const u8 *prev_psk)

189

{

190

struct hostapd_data *hapd = ctx;

191

return hostapd_get_psk(hapd->conf, addr, prev_psk);

192

}

193

194

195

static int hostapd_wpa_auth_get_msk(void *ctx, const u8 *addr, u8 *msk,

196

size_t *len)

197

{

198

struct hostapd_data *hapd = ctx;

199

const u8 *key;

200

size_t keylen;

201

struct sta_info *sta;

202

203

sta = ap_get_sta(hapd, addr);

204

if (sta == NULL)

205

return -1;

206

207

key = ieee802_1x_get_key(sta->eapol_sm, &keylen);

208

if (key == NULL)

209

return -1;

210

211

if (keylen > *len)

212

keylen = *len;

213

os_memcpy(msk, key, keylen);

214

*len = keylen;

215

216

return 0;

217

}

218

219

220

static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, enum wpa_alg alg,

221

const u8 *addr, int idx, u8 *key,

222

size_t key_len)

223

{

224

struct hostapd_data *hapd = ctx;

225

const char *ifname = hapd->conf->iface;

226

227

if (vlan_id > 0) {

228

ifname = hostapd_get_vlan_id_ifname(hapd->conf->vlan, vlan_id);

229

if (ifname == NULL)

230

return -1;

231

}

232

233

return hapd->drv.set_key(ifname, hapd, alg, addr, idx, 1, NULL, 0,

234

key, key_len);

235

}

236

237

238

static int hostapd_wpa_auth_get_seqnum(void *ctx, const u8 *addr, int idx,

239

u8 *seq)

240

{

241

struct hostapd_data *hapd = ctx;

242

return hostapd_get_seqnum(hapd->conf->iface, hapd, addr, idx, seq);

243

}

244

245

246

static int hostapd_wpa_auth_send_eapol(void *ctx, const u8 *addr,

247

const u8 *data, size_t data_len,

248

int encrypt)

249

{

250

struct hostapd_data *hapd = ctx;

251

return hapd->drv.send_eapol(hapd, addr, data, data_len, encrypt);

252

}

253

254

255

static int hostapd_wpa_auth_for_each_sta(

256

void *ctx, int (*cb)(struct wpa_state_machine *sm, void *ctx),

257

void *cb_ctx)

258

{

259

struct hostapd_data *hapd = ctx;

260

struct sta_info *sta;

261

262

for (sta = hapd->sta_list; sta; sta = sta->next) {

263

if (sta->wpa_sm && cb(sta->wpa_sm, cb_ctx))

264

return 1;

265

}

266

return 0;

267

}

268

269

270

struct wpa_auth_iface_iter_data {

271

int (*cb)(struct wpa_authenticator *sm, void *ctx);

272

void *cb_ctx;

273

};

274

275

static int wpa_auth_iface_iter(struct hostapd_iface *iface, void *ctx)

276

{

277

struct wpa_auth_iface_iter_data *data = ctx;

278

size_t i;

279

for (i = 0; i < iface->num_bss; i++) {

280

if (iface->bss[i]->wpa_auth &&

281

data->cb(iface->bss[i]->wpa_auth, data->cb_ctx))

282

return 1;

283

}

284

return 0;

285

}

286

287

288

static int hostapd_wpa_auth_for_each_auth(

289

void *ctx, int (*cb)(struct wpa_authenticator *sm, void *ctx),

290

void *cb_ctx)

291

{

292

struct hostapd_data *hapd = ctx;

293

struct wpa_auth_iface_iter_data data;

294

if (hapd->iface->for_each_interface == NULL)

295

return -1;

296

data.cb = cb;

297

data.cb_ctx = cb_ctx;

298

return hapd->iface->for_each_interface(hapd->iface->interfaces,

299

wpa_auth_iface_iter, &data);

300

}

301

302

303

#ifdef CONFIG_IEEE80211R

304

305

struct wpa_auth_ft_iface_iter_data {

306

struct hostapd_data *src_hapd;

307

const u8 *dst;

308

const u8 *data;

309

size_t data_len;

310

};

311

312

313

static int hostapd_wpa_auth_ft_iter(struct hostapd_iface *iface, void *ctx)

314

{

315

struct wpa_auth_ft_iface_iter_data *idata = ctx;

316

struct hostapd_data *hapd;

317

size_t j;

318

319

for (j = 0; j < iface->num_bss; j++) {

320

hapd = iface->bss[j];

321

if (hapd == idata->src_hapd)

322

continue;

323

if (os_memcmp(hapd->own_addr, idata->dst, ETH_ALEN) == 0) {

324

wpa_printf(MSG_DEBUG, "FT: Send RRB data directly to "

325

"locally managed BSS " MACSTR "@%s -> "

326

MACSTR "@%s",

327

MAC2STR(idata->src_hapd->own_addr),

328

idata->src_hapd->conf->iface,

329

MAC2STR(hapd->own_addr), hapd->conf->iface);

330

hostapd_rrb_receive(hapd, idata->src_hapd->own_addr,

331

idata->data, idata->data_len);

332

return 1;

333

}

334

}

335

336

return 0;

337

}

338

339

#endif /* CONFIG_IEEE80211R */

340

341

342

static int hostapd_wpa_auth_send_ether(void *ctx, const u8 *dst, u16 proto,

343

const u8 *data, size_t data_len)

344

{

345

struct hostapd_data *hapd = ctx;

346

347

#ifdef CONFIG_IEEE80211R

348

if (proto == ETH_P_RRB && hapd->iface->for_each_interface) {

349

int res;

350

struct wpa_auth_ft_iface_iter_data idata;

351

idata.src_hapd = hapd;

352

idata.dst = dst;

353

idata.data = data;

354

idata.data_len = data_len;

355

res = hapd->iface->for_each_interface(hapd->iface->interfaces,

356

hostapd_wpa_auth_ft_iter,

357

&idata);

358

if (res == 1)

359

return data_len;

360

}

361

#endif /* CONFIG_IEEE80211R */

362

363

if (hapd->driver && hapd->driver->send_ether)

364

return hapd->driver->send_ether(hapd->drv_priv, dst,

365

hapd->own_addr, proto,

366

data, data_len);

367

if (hapd->l2 == NULL)

368

return -1;

369

return l2_packet_send(hapd->l2, dst, proto, data, data_len);

370

}

371

372

373

#ifdef CONFIG_IEEE80211R

374

375

static int hostapd_wpa_auth_send_ft_action(void *ctx, const u8 *dst,

376

const u8 *data, size_t data_len)

377

{

378

struct hostapd_data *hapd = ctx;

379

int res;

380

struct ieee80211_mgmt *m;

381

size_t mlen;

382

struct sta_info *sta;

383

384

sta = ap_get_sta(hapd, dst);

385

if (sta == NULL || sta->wpa_sm == NULL)

386

return -1;

387

388

m = os_zalloc(sizeof(*m) + data_len);

389

if (m == NULL)

390

return -1;

391

mlen = ((u8 *) &m->u - (u8 *) m) + data_len;

392

m->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,

393

WLAN_FC_STYPE_ACTION);

394

os_memcpy(m->da, dst, ETH_ALEN);

395

os_memcpy(m->sa, hapd->own_addr, ETH_ALEN);

396

os_memcpy(m->bssid, hapd->own_addr, ETH_ALEN);

397

os_memcpy(&m->u, data, data_len);

398

399

res = hapd->drv.send_mgmt_frame(hapd, (u8 *) m, mlen);

400

os_free(m);

401

return res;

402

}

403

404

405

static struct wpa_state_machine *

406

hostapd_wpa_auth_add_sta(void *ctx, const u8 *sta_addr)

407

{

408

struct hostapd_data *hapd = ctx;

409

struct sta_info *sta;

410

411

sta = ap_sta_add(hapd, sta_addr);

412

if (sta == NULL)

413

return NULL;

414

if (sta->wpa_sm) {

415

sta->auth_alg = WLAN_AUTH_FT;

416

return sta->wpa_sm;

417

}

418

419

sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth, sta->addr);

420

if (sta->wpa_sm == NULL) {

421

ap_free_sta(hapd, sta);

422

return NULL;

423

}

424

sta->auth_alg = WLAN_AUTH_FT;

425

426

return sta->wpa_sm;

427

}

428

429

430

static void hostapd_rrb_receive(void *ctx, const u8 *src_addr, const u8 *buf,

431

size_t len)

432

{

433

struct hostapd_data *hapd = ctx;

434

wpa_ft_rrb_rx(hapd->wpa_auth, src_addr, buf, len);

435

}

436

437

#endif /* CONFIG_IEEE80211R */

438

439

440

int hostapd_setup_wpa(struct hostapd_data *hapd)

441

{

442

struct wpa_auth_config _conf;

443

struct wpa_auth_callbacks cb;

444

const u8 *wpa_ie;

445

size_t wpa_ie_len;

446

447

hostapd_wpa_auth_conf(hapd->conf, &_conf);

448

os_memset(&cb, 0, sizeof(cb));

449

cb.ctx = hapd;

450

cb.logger = hostapd_wpa_auth_logger;

451

cb.disconnect = hostapd_wpa_auth_disconnect;

452

cb.mic_failure_report = hostapd_wpa_auth_mic_failure_report;

453

cb.set_eapol = hostapd_wpa_auth_set_eapol;

454

cb.get_eapol = hostapd_wpa_auth_get_eapol;

455

cb.get_psk = hostapd_wpa_auth_get_psk;

456

cb.get_msk = hostapd_wpa_auth_get_msk;

457

cb.set_key = hostapd_wpa_auth_set_key;

458

cb.get_seqnum = hostapd_wpa_auth_get_seqnum;

459

cb.send_eapol = hostapd_wpa_auth_send_eapol;

460

cb.for_each_sta = hostapd_wpa_auth_for_each_sta;

461

cb.for_each_auth = hostapd_wpa_auth_for_each_auth;

462

cb.send_ether = hostapd_wpa_auth_send_ether;

463

#ifdef CONFIG_IEEE80211R

464

cb.send_ft_action = hostapd_wpa_auth_send_ft_action;

465

cb.add_sta = hostapd_wpa_auth_add_sta;

466

#endif /* CONFIG_IEEE80211R */

467

hapd->wpa_auth = wpa_init(hapd->own_addr, &_conf, &cb);

468

if (hapd->wpa_auth == NULL) {

469

wpa_printf(MSG_ERROR, "WPA initialization failed.");

470

return -1;

471

}

472

473

if (hostapd_set_privacy(hapd, 1)) {

474

wpa_printf(MSG_ERROR, "Could not set PrivacyInvoked "

475

"for interface %s", hapd->conf->iface);

476

return -1;

477

}

478

479

wpa_ie = wpa_auth_get_wpa_ie(hapd->wpa_auth, &wpa_ie_len);

480

if (hostapd_set_generic_elem(hapd, wpa_ie, wpa_ie_len)) {

481

wpa_printf(MSG_ERROR, "Failed to configure WPA IE for "

482

"the kernel driver.");

483

return -1;

484

}

485

486

if (rsn_preauth_iface_init(hapd)) {

487

wpa_printf(MSG_ERROR, "Initialization of RSN "

488

"pre-authentication failed.");

489

return -1;

490

}

491

492

#ifdef CONFIG_IEEE80211R

493

if (!hostapd_drv_none(hapd)) {

494

hapd->l2 = l2_packet_init(hapd->conf->bridge[0] ?

495

hapd->conf->bridge :

496

hapd->conf->iface, NULL, ETH_P_RRB,

497

hostapd_rrb_receive, hapd, 0);

498

if (hapd->l2 == NULL &&

499

(hapd->driver == NULL ||

500

hapd->driver->send_ether == NULL)) {

501

wpa_printf(MSG_ERROR, "Failed to open l2_packet "

502

"interface");

503

return -1;

504

}

505

}

506

#endif /* CONFIG_IEEE80211R */

507

508

return 0;

509

510

}

511

512

513

void hostapd_reconfig_wpa(struct hostapd_data *hapd)

514

{

515

struct wpa_auth_config wpa_auth_conf;

516

hostapd_wpa_auth_conf(hapd->conf, &wpa_auth_conf);

517

wpa_reconfig(hapd->wpa_auth, &wpa_auth_conf);

518

}

519

520

521

void hostapd_deinit_wpa(struct hostapd_data *hapd)

522

{

523

rsn_preauth_iface_deinit(hapd);

524

if (hapd->wpa_auth) {

525

wpa_deinit(hapd->wpa_auth);

526

hapd->wpa_auth = NULL;

527

528

if (hostapd_set_privacy(hapd, 0)) {

529

wpa_printf(MSG_DEBUG, "Could not disable "

530

"PrivacyInvoked for interface %s",

531

hapd->conf->iface);

532

}

533

534

if (hostapd_set_generic_elem(hapd, (u8 *) "", 0)) {

535

wpa_printf(MSG_DEBUG, "Could not remove generic "

536

"information element from interface %s",

537

hapd->conf->iface);

538

}

539

}

540

ieee802_1x_deinit(hapd);

541

542

#ifdef CONFIG_IEEE80211R

543

l2_packet_deinit(hapd->l2);

544

#endif /* CONFIG_IEEE80211R */

545

}

Older »