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

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/ap_drv_ops.c

* hostapd - Driver operations

* 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 "drivers/driver.h"

#include "common/ieee802_11_defs.h"

#include "hostapd.h"

#include "ieee802_11.h"

#include "sta_info.h"

#include "ap_config.h"

#include "ap_drv_ops.h"

static int hostapd_sta_flags_to_drv(int flags)

{

int res = 0;

if (flags & WLAN_STA_AUTHORIZED)

res |= WPA_STA_AUTHORIZED;

if (flags & WLAN_STA_WMM)

res |= WPA_STA_WMM;

if (flags & WLAN_STA_SHORT_PREAMBLE)

res |= WPA_STA_SHORT_PREAMBLE;

if (flags & WLAN_STA_MFP)

res |= WPA_STA_MFP;

return res;

}

static int hostapd_set_ap_wps_ie(struct hostapd_data *hapd)

{

struct wpabuf *beacon, *proberesp;

int ret;

if (hapd->driver == NULL || hapd->driver->set_ap_wps_ie == NULL)

return 0;

beacon = hapd->wps_beacon_ie;

proberesp = hapd->wps_probe_resp_ie;

ret = hapd->driver->set_ap_wps_ie(hapd->drv_priv, beacon, proberesp);

return ret;

}

static int hostapd_send_mgmt_frame(struct hostapd_data *hapd, const void *msg,

size_t len)

{

if (hapd->driver == NULL || hapd->driver->send_mlme == NULL)

return 0;

return hapd->driver->send_mlme(hapd->drv_priv, msg, len);

}

static int hostapd_send_eapol(struct hostapd_data *hapd, const u8 *addr,

const u8 *data, size_t data_len, int encrypt)

{

if (hapd->driver == NULL || hapd->driver->hapd_send_eapol == NULL)

return 0;

return hapd->driver->hapd_send_eapol(hapd->drv_priv, addr, data,

data_len, encrypt,

hapd->own_addr);

}

static int hostapd_set_authorized(struct hostapd_data *hapd,

struct sta_info *sta, int authorized)

{

if (authorized) {

return hostapd_sta_set_flags(hapd, sta->addr,

hostapd_sta_flags_to_drv(

sta->flags),

WPA_STA_AUTHORIZED, ~0);

}

return hostapd_sta_set_flags(hapd, sta->addr,

hostapd_sta_flags_to_drv(sta->flags),

0, ~WPA_STA_AUTHORIZED);

}

static int hostapd_set_key(const char *ifname, struct hostapd_data *hapd,

enum wpa_alg alg, const u8 *addr, int key_idx,

int set_tx, const u8 *seq, size_t seq_len,

const u8 *key, size_t key_len)

{

100

if (hapd->driver == NULL || hapd->driver->set_key == NULL)

101

return 0;

102

return hapd->driver->set_key(ifname, hapd->drv_priv, alg, addr,

103

key_idx, set_tx, seq, seq_len, key,

104

key_len);

105

}

106

107

108

static int hostapd_read_sta_data(struct hostapd_data *hapd,

109

struct hostap_sta_driver_data *data,

110

const u8 *addr)

111

{

112

if (hapd->driver == NULL || hapd->driver->read_sta_data == NULL)

113

return -1;

114

return hapd->driver->read_sta_data(hapd->drv_priv, data, addr);

115

}

116

117

118

static int hostapd_sta_clear_stats(struct hostapd_data *hapd, const u8 *addr)

119

{

120

if (hapd->driver == NULL || hapd->driver->sta_clear_stats == NULL)

121

return 0;

122

return hapd->driver->sta_clear_stats(hapd->drv_priv, addr);

123

}

124

125

126

static int hostapd_set_sta_flags(struct hostapd_data *hapd,

127

struct sta_info *sta)

128

{

129

int set_flags, total_flags, flags_and, flags_or;

130

total_flags = hostapd_sta_flags_to_drv(sta->flags);

131

set_flags = WPA_STA_SHORT_PREAMBLE | WPA_STA_WMM | WPA_STA_MFP;

132

if (((!hapd->conf->ieee802_1x && !hapd->conf->wpa) ||

133

sta->auth_alg == WLAN_AUTH_FT) &&

134

sta->flags & WLAN_STA_AUTHORIZED)

135

set_flags |= WPA_STA_AUTHORIZED;

136

flags_or = total_flags & set_flags;

137

flags_and = total_flags | ~set_flags;

138

return hostapd_sta_set_flags(hapd, sta->addr, total_flags,

139

flags_or, flags_and);

140

}

141

142

143

static int hostapd_set_drv_ieee8021x(struct hostapd_data *hapd,

144

const char *ifname, int enabled)

145

{

146

struct wpa_bss_params params;

147

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

148

params.ifname = ifname;

149

params.enabled = enabled;

150

if (enabled) {

151

params.wpa = hapd->conf->wpa;

152

params.ieee802_1x = hapd->conf->ieee802_1x;

153

params.wpa_group = hapd->conf->wpa_group;

154

params.wpa_pairwise = hapd->conf->wpa_pairwise;

155

params.wpa_key_mgmt = hapd->conf->wpa_key_mgmt;

156

params.rsn_preauth = hapd->conf->rsn_preauth;

157

}

158

return hostapd_set_ieee8021x(hapd, &params);

159

}

160

161

162

static int hostapd_set_radius_acl_auth(struct hostapd_data *hapd,

163

const u8 *mac, int accepted,

164

u32 session_timeout)

165

{

166

if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)

167

return 0;

168

return hapd->driver->set_radius_acl_auth(hapd->drv_priv, mac, accepted,

169

session_timeout);

170

}

171

172

173

static int hostapd_set_radius_acl_expire(struct hostapd_data *hapd,

174

const u8 *mac)

175

{

176

if (hapd->driver == NULL ||

177

hapd->driver->set_radius_acl_expire == NULL)

178

return 0;

179

return hapd->driver->set_radius_acl_expire(hapd->drv_priv, mac);

180

}

181

182

183

static int hostapd_set_bss_params(struct hostapd_data *hapd,

184

int use_protection)

185

{

186

int ret = 0;

187

int preamble;

188

#ifdef CONFIG_IEEE80211N

189

u8 buf[60], *ht_capab, *ht_oper, *pos;

190

191

pos = buf;

192

ht_capab = pos;

193

pos = hostapd_eid_ht_capabilities(hapd, pos);

194

ht_oper = pos;

195

pos = hostapd_eid_ht_operation(hapd, pos);

196

if (pos > ht_oper && ht_oper > ht_capab &&

197

hostapd_set_ht_params(hapd, ht_capab + 2, ht_capab[1],

198

ht_oper + 2, ht_oper[1])) {

199

wpa_printf(MSG_ERROR, "Could not set HT capabilities "

200

"for kernel driver");

201

ret = -1;

202

}

203

204

#endif /* CONFIG_IEEE80211N */

205

206

if (hostapd_set_cts_protect(hapd, use_protection)) {

207

wpa_printf(MSG_ERROR, "Failed to set CTS protect in kernel "

208

"driver");

209

ret = -1;

210

}

211

212

if (hapd->iface->current_mode &&

213

hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G &&

214

hostapd_set_short_slot_time(hapd,

215

hapd->iface->num_sta_no_short_slot_time

216

> 0 ? 0 : 1)) {

217

wpa_printf(MSG_ERROR, "Failed to set Short Slot Time option "

218

"in kernel driver");

219

ret = -1;

220

}

221

222

if (hapd->iface->num_sta_no_short_preamble == 0 &&

223

hapd->iconf->preamble == SHORT_PREAMBLE)

224

preamble = SHORT_PREAMBLE;

225

else

226

preamble = LONG_PREAMBLE;

227

if (hostapd_set_preamble(hapd, preamble)) {

228

wpa_printf(MSG_ERROR, "Could not set preamble for kernel "

229

"driver");

230

ret = -1;

231

}

232

233

return ret;

234

}

235

236

237

static int hostapd_set_beacon(struct hostapd_data *hapd,

238

const u8 *head, size_t head_len,

239

const u8 *tail, size_t tail_len, int dtim_period,

240

int beacon_int)

241

{

242

if (hapd->driver == NULL || hapd->driver->set_beacon == NULL)

243

return 0;

244

return hapd->driver->set_beacon(hapd->drv_priv,

245

head, head_len, tail, tail_len,

246

dtim_period, beacon_int);

247

}

248

249

250

static int hostapd_vlan_if_add(struct hostapd_data *hapd, const char *ifname)

251

{

252

char force_ifname[IFNAMSIZ];

253

u8 if_addr[ETH_ALEN];

254

return hostapd_if_add(hapd, WPA_IF_AP_VLAN, ifname, NULL, NULL, NULL,

255

force_ifname, if_addr);

256

}

257

258

static int hostapd_vlan_if_remove(struct hostapd_data *hapd,

259

const char *ifname)

260

{

261

return hostapd_if_remove(hapd, WPA_IF_AP_VLAN, ifname);

262

}

263

264

265

static int hostapd_set_wds_sta(struct hostapd_data *hapd, const u8 *addr,

266

int aid, int val)

267

{

268

if (hapd->driver == NULL || hapd->driver->set_wds_sta == NULL)

269

return 0;

270

return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val);

271

}

272

273

274

static int hostapd_set_sta_vlan(const char *ifname, struct hostapd_data *hapd,

275

const u8 *addr, int vlan_id)

276

{

277

if (hapd->driver == NULL || hapd->driver->set_sta_vlan == NULL)

278

return 0;

279

return hapd->driver->set_sta_vlan(hapd->drv_priv, addr, ifname,

280

vlan_id);

281

}

282

283

284

static int hostapd_get_inact_sec(struct hostapd_data *hapd, const u8 *addr)

285

{

286

if (hapd->driver == NULL || hapd->driver->get_inact_sec == NULL)

287

return 0;

288

return hapd->driver->get_inact_sec(hapd->drv_priv, addr);

289

}

290

291

292

static int hostapd_sta_deauth(struct hostapd_data *hapd, const u8 *addr,

293

int reason)

294

{

295

if (hapd->driver == NULL || hapd->driver->sta_deauth == NULL)

296

return 0;

297

return hapd->driver->sta_deauth(hapd->drv_priv, hapd->own_addr, addr,

298

reason);

299

}

300

301

302

static int hostapd_sta_disassoc(struct hostapd_data *hapd, const u8 *addr,

303

int reason)

304

{

305

if (hapd->driver == NULL || hapd->driver->sta_disassoc == NULL)

306

return 0;

307

return hapd->driver->sta_disassoc(hapd->drv_priv, hapd->own_addr, addr,

308

reason);

309

}

310

311

312

static int hostapd_sta_add(struct hostapd_data *hapd,

313

const u8 *addr, u16 aid, u16 capability,

314

const u8 *supp_rates, size_t supp_rates_len,

315

u16 listen_interval,

316

const struct ieee80211_ht_capabilities *ht_capab)

317

{

318

struct hostapd_sta_add_params params;

319

320

if (hapd->driver == NULL)

321

return 0;

322

if (hapd->driver->sta_add == NULL)

323

return 0;

324

325

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

326

params.addr = addr;

327

params.aid = aid;

328

params.capability = capability;

329

params.supp_rates = supp_rates;

330

params.supp_rates_len = supp_rates_len;

331

params.listen_interval = listen_interval;

332

params.ht_capabilities = ht_capab;

333

return hapd->driver->sta_add(hapd->drv_priv, &params);

334

}

335

336

337

static int hostapd_sta_remove(struct hostapd_data *hapd, const u8 *addr)

338

{

339

if (hapd->driver == NULL || hapd->driver->sta_remove == NULL)

340

return 0;

341

return hapd->driver->sta_remove(hapd->drv_priv, addr);

342

}

343

344

345

static int hostapd_set_countermeasures(struct hostapd_data *hapd, int enabled)

346

{

347

if (hapd->driver == NULL ||

348

hapd->driver->hapd_set_countermeasures == NULL)

349

return 0;

350

return hapd->driver->hapd_set_countermeasures(hapd->drv_priv, enabled);

351

}

352

353

354

void hostapd_set_driver_ops(struct hostapd_driver_ops *ops)

355

{

356

ops->set_ap_wps_ie = hostapd_set_ap_wps_ie;

357

ops->send_mgmt_frame = hostapd_send_mgmt_frame;

358

ops->send_eapol = hostapd_send_eapol;

359

ops->set_authorized = hostapd_set_authorized;

360

ops->set_key = hostapd_set_key;

361

ops->read_sta_data = hostapd_read_sta_data;

362

ops->sta_clear_stats = hostapd_sta_clear_stats;

363

ops->set_sta_flags = hostapd_set_sta_flags;

364

ops->set_drv_ieee8021x = hostapd_set_drv_ieee8021x;

365

ops->set_radius_acl_auth = hostapd_set_radius_acl_auth;

366

ops->set_radius_acl_expire = hostapd_set_radius_acl_expire;

367

ops->set_bss_params = hostapd_set_bss_params;

368

ops->set_beacon = hostapd_set_beacon;

369

ops->vlan_if_add = hostapd_vlan_if_add;

370

ops->vlan_if_remove = hostapd_vlan_if_remove;

371

ops->set_wds_sta = hostapd_set_wds_sta;

372

ops->set_sta_vlan = hostapd_set_sta_vlan;

373

ops->get_inact_sec = hostapd_get_inact_sec;

374

ops->sta_deauth = hostapd_sta_deauth;

375

ops->sta_disassoc = hostapd_sta_disassoc;

376

ops->sta_add = hostapd_sta_add;

377

ops->sta_remove = hostapd_sta_remove;

378

ops->set_countermeasures = hostapd_set_countermeasures;

379

}

380

381

382

int hostapd_set_privacy(struct hostapd_data *hapd, int enabled)

383

{

384

if (hapd->driver == NULL || hapd->driver->set_privacy == NULL)

385

return 0;

386

return hapd->driver->set_privacy(hapd->drv_priv, enabled);

387

}

388

389

390

int hostapd_set_generic_elem(struct hostapd_data *hapd, const u8 *elem,

391

size_t elem_len)

392

{

393

if (hapd->driver == NULL || hapd->driver->set_generic_elem == NULL)

394

return 0;

395

return hapd->driver->set_generic_elem(hapd->drv_priv, elem, elem_len);

396

}

397

398

399

int hostapd_get_ssid(struct hostapd_data *hapd, u8 *buf, size_t len)

400

{

401

if (hapd->driver == NULL || hapd->driver->hapd_get_ssid == NULL)

402

return 0;

403

return hapd->driver->hapd_get_ssid(hapd->drv_priv, buf, len);

404

}

405

406

407

int hostapd_set_ssid(struct hostapd_data *hapd, const u8 *buf, size_t len)

408

{

409

if (hapd->driver == NULL || hapd->driver->hapd_set_ssid == NULL)

410

return 0;

411

return hapd->driver->hapd_set_ssid(hapd->drv_priv, buf, len);

412

}

413

414

415

int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,

416

const char *ifname, const u8 *addr, void *bss_ctx,

417

void **drv_priv, char *force_ifname, u8 *if_addr)

418

{

419

if (hapd->driver == NULL || hapd->driver->if_add == NULL)

420

return -1;

421

return hapd->driver->if_add(hapd->drv_priv, type, ifname, addr,

422

bss_ctx, drv_priv, force_ifname, if_addr);

423

}

424

425

426

int hostapd_if_remove(struct hostapd_data *hapd, enum wpa_driver_if_type type,

427

const char *ifname)

428

{

429

if (hapd->driver == NULL || hapd->driver->if_remove == NULL)

430

return -1;

431

return hapd->driver->if_remove(hapd->drv_priv, type, ifname);

432

}

433

434

435

int hostapd_set_ieee8021x(struct hostapd_data *hapd,

436

struct wpa_bss_params *params)

437

{

438

if (hapd->driver == NULL || hapd->driver->set_ieee8021x == NULL)

439

return 0;

440

return hapd->driver->set_ieee8021x(hapd->drv_priv, params);

441

}

442

443

444

int hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,

445

const u8 *addr, int idx, u8 *seq)

446

{

447

if (hapd->driver == NULL || hapd->driver->get_seqnum == NULL)

448

return 0;

449

return hapd->driver->get_seqnum(ifname, hapd->drv_priv, addr, idx,

450

seq);

451

}

452

453

454

int hostapd_flush(struct hostapd_data *hapd)

455

{

456

if (hapd->driver == NULL || hapd->driver->flush == NULL)

457

return 0;

458

return hapd->driver->flush(hapd->drv_priv);

459

}

460

461

462

int hostapd_set_freq(struct hostapd_data *hapd, int mode, int freq,

463

int channel, int ht_enabled, int sec_channel_offset)

464

{

465

struct hostapd_freq_params data;

466

if (hapd->driver == NULL)

467

return 0;

468

if (hapd->driver->set_freq == NULL)

469

return 0;

470

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

471

data.mode = mode;

472

data.freq = freq;

473

data.channel = channel;

474

data.ht_enabled = ht_enabled;

475

data.sec_channel_offset = sec_channel_offset;

476

return hapd->driver->set_freq(hapd->drv_priv, &data);

477

}

478

479

int hostapd_set_rts(struct hostapd_data *hapd, int rts)

480

{

481

if (hapd->driver == NULL || hapd->driver->set_rts == NULL)

482

return 0;

483

return hapd->driver->set_rts(hapd->drv_priv, rts);

484

}

485

486

487

int hostapd_set_frag(struct hostapd_data *hapd, int frag)

488

{

489

if (hapd->driver == NULL || hapd->driver->set_frag == NULL)

490

return 0;

491

return hapd->driver->set_frag(hapd->drv_priv, frag);

492

}

493

494

495

int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,

496

int total_flags, int flags_or, int flags_and)

497

{

498

if (hapd->driver == NULL || hapd->driver->sta_set_flags == NULL)

499

return 0;

500

return hapd->driver->sta_set_flags(hapd->drv_priv, addr, total_flags,

501

flags_or, flags_and);

502

}

503

504

505

int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,

506

int *basic_rates, int mode)

507

{

508

if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)

509

return 0;

510

return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates,

511

basic_rates, mode);

512

}

513

514

515

int hostapd_set_country(struct hostapd_data *hapd, const char *country)

516

{

517

if (hapd->driver == NULL ||

518

hapd->driver->set_country == NULL)

519

return 0;

520

return hapd->driver->set_country(hapd->drv_priv, country);

521

}

522

523

524

int hostapd_set_cts_protect(struct hostapd_data *hapd, int value)

525

{

526

if (hapd->driver == NULL || hapd->driver->set_cts_protect == NULL)

527

return 0;

528

return hapd->driver->set_cts_protect(hapd->drv_priv, value);

529

}

530

531

532

int hostapd_set_preamble(struct hostapd_data *hapd, int value)

533

{

534

if (hapd->driver == NULL || hapd->driver->set_preamble == NULL)

535

return 0;

536

return hapd->driver->set_preamble(hapd->drv_priv, value);

537

}

538

539

540

int hostapd_set_short_slot_time(struct hostapd_data *hapd, int value)

541

{

542

if (hapd->driver == NULL || hapd->driver->set_short_slot_time == NULL)

543

return 0;

544

return hapd->driver->set_short_slot_time(hapd->drv_priv, value);

545

}

546

547

548

int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,

549

int cw_min, int cw_max, int burst_time)

550

{

551

if (hapd->driver == NULL || hapd->driver->set_tx_queue_params == NULL)

552

return 0;

553

return hapd->driver->set_tx_queue_params(hapd->drv_priv, queue, aifs,

554

cw_min, cw_max, burst_time);

555

}

556

557

558

int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,

559

const u8 *mask)

560

{

561

if (hapd->driver == NULL || hapd->driver->valid_bss_mask == NULL)

562

return 1;

563

return hapd->driver->valid_bss_mask(hapd->drv_priv, addr, mask);

564

}

565

566

567

struct hostapd_hw_modes *

568

hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,

569

u16 *flags)

570

{

571

if (hapd->driver == NULL ||

572

hapd->driver->get_hw_feature_data == NULL)

573

return NULL;

574

return hapd->driver->get_hw_feature_data(hapd->drv_priv, num_modes,

575

flags);

576

}

577

578

579

int hostapd_driver_commit(struct hostapd_data *hapd)

580

{

581

if (hapd->driver == NULL || hapd->driver->commit == NULL)

582

return 0;

583

return hapd->driver->commit(hapd->drv_priv);

584

}

585

586

587

int hostapd_set_ht_params(struct hostapd_data *hapd,

588

const u8 *ht_capab, size_t ht_capab_len,

589

const u8 *ht_oper, size_t ht_oper_len)

590

{

591

if (hapd->driver == NULL || hapd->driver->set_ht_params == NULL ||

592

ht_capab == NULL || ht_oper == NULL)

593

return 0;

594

return hapd->driver->set_ht_params(hapd->drv_priv,

595

ht_capab, ht_capab_len,

596

ht_oper, ht_oper_len);

597

}

598

599

600

int hostapd_drv_none(struct hostapd_data *hapd)

601

{

602

return hapd->driver && os_strcmp(hapd->driver->name, "none") == 0;

603

}

604

605

606

int hostapd_driver_scan(struct hostapd_data *hapd,

607

struct wpa_driver_scan_params *params)

608

{

609

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

610

return hapd->driver->scan2(hapd->drv_priv, params);

611

return -1;

612

}

613

614

615

struct wpa_scan_results * hostapd_driver_get_scan_results(

616

struct hostapd_data *hapd)

617

{

618

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

619

return hapd->driver->get_scan_results2(hapd->drv_priv);

620

return NULL;

621

}

Older »