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

Viewing changes to wpa_supplicant/ibss_rsn.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

wpa_supplicant/ibss_rsn.c

* wpa_supplicant - IBSS RSN

* 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 "includes.h"

#include "common.h"

#include "l2_packet/l2_packet.h"

#include "rsn_supp/wpa.h"

#include "rsn_supp/wpa_ie.h"

#include "ap/wpa_auth.h"

#include "wpa_supplicant_i.h"

#include "driver_i.h"

#include "ibss_rsn.h"

static void ibss_rsn_free(struct ibss_rsn_peer *peer)

{

wpa_auth_sta_deinit(peer->auth);

wpa_sm_deinit(peer->supp);

os_free(peer);

}

static void supp_set_state(void *ctx, enum wpa_states state)

{

struct ibss_rsn_peer *peer = ctx;

peer->supp_state = state;

}

static int supp_ether_send(void *ctx, const u8 *dest, u16 proto, const u8 *buf,

size_t len)

{

struct ibss_rsn_peer *peer = ctx;

struct wpa_supplicant *wpa_s = peer->ibss_rsn->wpa_s;

wpa_printf(MSG_DEBUG, "SUPP: %s(dest=" MACSTR " proto=0x%04x "

"len=%lu)",

__func__, MAC2STR(dest), proto, (unsigned long) len);

if (wpa_s->l2)

return l2_packet_send(wpa_s->l2, dest, proto, buf, len);

return wpa_drv_send_eapol(wpa_s, dest, proto, buf, len);

}

static u8 * supp_alloc_eapol(void *ctx, u8 type, const void *data,

u16 data_len, size_t *msg_len, void **data_pos)

{

struct ieee802_1x_hdr *hdr;

wpa_printf(MSG_DEBUG, "SUPP: %s(type=%d data_len=%d)",

__func__, type, data_len);

*msg_len = sizeof(*hdr) + data_len;

hdr = os_malloc(*msg_len);

if (hdr == NULL)

return NULL;

hdr->version = 2;

hdr->type = type;

hdr->length = host_to_be16(data_len);

if (data)

os_memcpy(hdr + 1, data, data_len);

else

os_memset(hdr + 1, 0, data_len);

if (data_pos)

*data_pos = hdr + 1;

return (u8 *) hdr;

}

static int supp_get_beacon_ie(void *ctx)

{

struct ibss_rsn_peer *peer = ctx;

wpa_printf(MSG_DEBUG, "SUPP: %s", __func__);

/* TODO: get correct RSN IE */

return wpa_sm_set_ap_rsn_ie(peer->supp,

(u8 *) "\x30\x14\x01\x00"

"\x00\x0f\xac\x04"

"\x01\x00\x00\x0f\xac\x04"

"\x01\x00\x00\x0f\xac\x02"

"\x00\x00", 22);

100

}

101

102

103

static int supp_set_key(void *ctx, enum wpa_alg alg,

104

const u8 *addr, int key_idx, int set_tx,

105

const u8 *seq, size_t seq_len,

106

const u8 *key, size_t key_len)

107

{

108

struct ibss_rsn_peer *peer = ctx;

109

110

wpa_printf(MSG_DEBUG, "SUPP: %s(alg=%d addr=" MACSTR " key_idx=%d "

111

"set_tx=%d)",

112

__func__, alg, MAC2STR(addr), key_idx, set_tx);

113

wpa_hexdump(MSG_DEBUG, "SUPP: set_key - seq", seq, seq_len);

114

wpa_hexdump_key(MSG_DEBUG, "SUPP: set_key - key", key, key_len);

115

116

if (key_idx == 0) {

117

118

* In IBSS RSN, the pairwise key from the 4-way handshake

119

* initiated by the peer with highest MAC address is used.

120

121

if (os_memcmp(peer->ibss_rsn->wpa_s->own_addr, peer->addr,

122

ETH_ALEN) > 0) {

123

wpa_printf(MSG_DEBUG, "SUPP: Do not use this PTK");

124

return 0;

125

}

126

}

127

128

return wpa_drv_set_key(peer->ibss_rsn->wpa_s, alg, addr, key_idx,

129

set_tx, seq, seq_len, key, key_len);

130

}

131

132

133

static void * supp_get_network_ctx(void *ctx)

134

{

135

struct ibss_rsn_peer *peer = ctx;

136

return wpa_supplicant_get_ssid(peer->ibss_rsn->wpa_s);

137

}

138

139

140

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

141

int protection_type, int key_type)

142

{

143

wpa_printf(MSG_DEBUG, "SUPP: %s(addr=" MACSTR " protection_type=%d "

144

"key_type=%d)",

145

__func__, MAC2STR(addr), protection_type, key_type);

146

return 0;

147

}

148

149

150

static void supp_cancel_auth_timeout(void *ctx)

151

{

152

wpa_printf(MSG_DEBUG, "SUPP: %s", __func__);

153

}

154

155

156

int ibss_rsn_supp_init(struct ibss_rsn_peer *peer, const u8 *own_addr,

157

const u8 *psk)

158

{

159

struct wpa_sm_ctx *ctx = os_zalloc(sizeof(*ctx));

160

if (ctx == NULL)

161

return -1;

162

163

ctx->ctx = peer;

164

ctx->msg_ctx = peer->ibss_rsn->wpa_s;

165

ctx->set_state = supp_set_state;

166

ctx->ether_send = supp_ether_send;

167

ctx->get_beacon_ie = supp_get_beacon_ie;

168

ctx->alloc_eapol = supp_alloc_eapol;

169

ctx->set_key = supp_set_key;

170

ctx->get_network_ctx = supp_get_network_ctx;

171

ctx->mlme_setprotection = supp_mlme_setprotection;

172

ctx->cancel_auth_timeout = supp_cancel_auth_timeout;

173

peer->supp = wpa_sm_init(ctx);

174

if (peer->supp == NULL) {

175

wpa_printf(MSG_DEBUG, "SUPP: wpa_sm_init() failed");

176

return -1;

177

}

178

179

wpa_sm_set_own_addr(peer->supp, own_addr);

180

wpa_sm_set_param(peer->supp, WPA_PARAM_RSN_ENABLED, 1);

181

wpa_sm_set_param(peer->supp, WPA_PARAM_PROTO, WPA_PROTO_RSN);

182

wpa_sm_set_param(peer->supp, WPA_PARAM_PAIRWISE, WPA_CIPHER_CCMP);

183

wpa_sm_set_param(peer->supp, WPA_PARAM_GROUP, WPA_CIPHER_CCMP);

184

wpa_sm_set_param(peer->supp, WPA_PARAM_KEY_MGMT, WPA_KEY_MGMT_PSK);

185

wpa_sm_set_pmk(peer->supp, psk, PMK_LEN);

186

187

peer->supp_ie_len = sizeof(peer->supp_ie);

188

if (wpa_sm_set_assoc_wpa_ie_default(peer->supp, peer->supp_ie,

189

&peer->supp_ie_len) < 0) {

190

wpa_printf(MSG_DEBUG, "SUPP: wpa_sm_set_assoc_wpa_ie_default()"

191

" failed");

192

return -1;

193

}

194

195

wpa_sm_notify_assoc(peer->supp, peer->addr);

196

197

return 0;

198

}

199

200

201

static void auth_logger(void *ctx, const u8 *addr, logger_level level,

202

const char *txt)

203

{

204

if (addr)

205

wpa_printf(MSG_DEBUG, "AUTH: " MACSTR " - %s",

206

MAC2STR(addr), txt);

207

else

208

wpa_printf(MSG_DEBUG, "AUTH: %s", txt);

209

}

210

211

212

static const u8 * auth_get_psk(void *ctx, const u8 *addr, const u8 *prev_psk)

213

{

214

struct ibss_rsn *ibss_rsn = ctx;

215

wpa_printf(MSG_DEBUG, "AUTH: %s (addr=" MACSTR " prev_psk=%p)",

216

__func__, MAC2STR(addr), prev_psk);

217

if (prev_psk)

218

return NULL;

219

return ibss_rsn->psk;

220

}

221

222

223

static int auth_send_eapol(void *ctx, const u8 *addr, const u8 *data,

224

size_t data_len, int encrypt)

225

{

226

struct ibss_rsn *ibss_rsn = ctx;

227

struct wpa_supplicant *wpa_s = ibss_rsn->wpa_s;

228

229

wpa_printf(MSG_DEBUG, "AUTH: %s(addr=" MACSTR " data_len=%lu "

230

"encrypt=%d)",

231

__func__, MAC2STR(addr), (unsigned long) data_len, encrypt);

232

233

if (wpa_s->l2)

234

return l2_packet_send(wpa_s->l2, addr, ETH_P_EAPOL, data,

235

data_len);

236

237

return wpa_drv_send_eapol(wpa_s, addr, ETH_P_EAPOL, data, data_len);

238

}

239

240

241

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

242

const u8 *addr, int idx, u8 *key, size_t key_len)

243

{

244

struct ibss_rsn *ibss_rsn = ctx;

245

u8 seq[6];

246

247

os_memset(seq, 0, sizeof(seq));

248

249

if (addr) {

250

wpa_printf(MSG_DEBUG, "AUTH: %s(alg=%d addr=" MACSTR

251

" key_idx=%d)",

252

__func__, alg, MAC2STR(addr), idx);

253

} else {

254

wpa_printf(MSG_DEBUG, "AUTH: %s(alg=%d key_idx=%d)",

255

__func__, alg, idx);

256

}

257

wpa_hexdump_key(MSG_DEBUG, "AUTH: set_key - key", key, key_len);

258

259

if (idx == 0) {

260

261

* In IBSS RSN, the pairwise key from the 4-way handshake

262

* initiated by the peer with highest MAC address is used.

263

264

if (addr == NULL ||

265

os_memcmp(ibss_rsn->wpa_s->own_addr, addr, ETH_ALEN) < 0) {

266

wpa_printf(MSG_DEBUG, "AUTH: Do not use this PTK");

267

return 0;

268

}

269

}

270

271

return wpa_drv_set_key(ibss_rsn->wpa_s, alg, addr, idx,

272

1, seq, 6, key, key_len);

273

}

274

275

276

static int ibss_rsn_auth_init_group(struct ibss_rsn *ibss_rsn,

277

const u8 *own_addr)

278

{

279

struct wpa_auth_config conf;

280

struct wpa_auth_callbacks cb;

281

282

wpa_printf(MSG_DEBUG, "AUTH: Initializing group state machine");

283

284

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

285

conf.wpa = 2;

286

conf.wpa_key_mgmt = WPA_KEY_MGMT_PSK;

287

conf.wpa_pairwise = WPA_CIPHER_CCMP;

288

conf.rsn_pairwise = WPA_CIPHER_CCMP;

289

conf.wpa_group = WPA_CIPHER_CCMP;

290

conf.eapol_version = 2;

291

292

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

293

cb.ctx = ibss_rsn;

294

cb.logger = auth_logger;

295

cb.send_eapol = auth_send_eapol;

296

cb.get_psk = auth_get_psk;

297

cb.set_key = auth_set_key;

298

299

ibss_rsn->auth_group = wpa_init(own_addr, &conf, &cb);

300

if (ibss_rsn->auth_group == NULL) {

301

wpa_printf(MSG_DEBUG, "AUTH: wpa_init() failed");

302

return -1;

303

}

304

305

return 0;

306

}

307

308

309

static int ibss_rsn_auth_init(struct ibss_rsn *ibss_rsn,

310

struct ibss_rsn_peer *peer)

311

{

312

peer->auth = wpa_auth_sta_init(ibss_rsn->auth_group, peer->addr);

313

if (peer->auth == NULL) {

314

wpa_printf(MSG_DEBUG, "AUTH: wpa_auth_sta_init() failed");

315

return -1;

316

}

317

318

/* TODO: get peer RSN IE with Probe Request */

319

if (wpa_validate_wpa_ie(ibss_rsn->auth_group, peer->auth,

320

(u8 *) "\x30\x14\x01\x00"

321

"\x00\x0f\xac\x04"

322

"\x01\x00\x00\x0f\xac\x04"

323

"\x01\x00\x00\x0f\xac\x02"

324

"\x00\x00", 22, NULL, 0) !=

325

WPA_IE_OK) {

326

wpa_printf(MSG_DEBUG, "AUTH: wpa_validate_wpa_ie() failed");

327

return -1;

328

}

329

330

if (wpa_auth_sm_event(peer->auth, WPA_ASSOC))

331

return -1;

332

333

if (wpa_auth_sta_associated(ibss_rsn->auth_group, peer->auth))

334

return -1;

335

336

return 0;

337

}

338

339

340

int ibss_rsn_start(struct ibss_rsn *ibss_rsn, const u8 *addr)

341

{

342

struct ibss_rsn_peer *peer;

343

344

wpa_printf(MSG_DEBUG, "RSN: Starting IBSS Authenticator and "

345

"Supplicant for peer " MACSTR, MAC2STR(addr));

346

347

peer = os_zalloc(sizeof(*peer));

348

if (peer == NULL)

349

return -1;

350

351

peer->ibss_rsn = ibss_rsn;

352

os_memcpy(peer->addr, addr, ETH_ALEN);

353

354

if (ibss_rsn_supp_init(peer, ibss_rsn->wpa_s->own_addr, ibss_rsn->psk)

355

< 0) {

356

ibss_rsn_free(peer);

357

return -1;

358

}

359

360

if (ibss_rsn_auth_init(ibss_rsn, peer) < 0) {

361

ibss_rsn_free(peer);

362

return -1;

363

}

364

365

peer->next = ibss_rsn->peers;

366

ibss_rsn->peers = peer;

367

368

return 0;

369

}

370

371

372

struct ibss_rsn * ibss_rsn_init(struct wpa_supplicant *wpa_s)

373

{

374

struct ibss_rsn *ibss_rsn;

375

376

ibss_rsn = os_zalloc(sizeof(*ibss_rsn));

377

if (ibss_rsn == NULL)

378

return NULL;

379

ibss_rsn->wpa_s = wpa_s;

380

381

if (ibss_rsn_auth_init_group(ibss_rsn, wpa_s->own_addr) < 0) {

382

ibss_rsn_deinit(ibss_rsn);

383

return NULL;

384

}

385

386

return ibss_rsn;

387

}

388

389

390

void ibss_rsn_deinit(struct ibss_rsn *ibss_rsn)

391

{

392

struct ibss_rsn_peer *peer, *prev;

393

394

if (ibss_rsn == NULL)

395

return;

396

397

peer = ibss_rsn->peers;

398

while (peer) {

399

prev = peer;

400

peer = peer->next;

401

ibss_rsn_free(prev);

402

}

403

404

wpa_deinit(ibss_rsn->auth_group);

405

os_free(ibss_rsn);

406

407

}

408

409

410

static int ibss_rsn_eapol_dst_supp(const u8 *buf, size_t len)

411

{

412

const struct ieee802_1x_hdr *hdr;

413

const struct wpa_eapol_key *key;

414

u16 key_info;

415

size_t plen;

416

417

/* TODO: Support other EAPOL packets than just EAPOL-Key */

418

419

if (len < sizeof(*hdr) + sizeof(*key))

420

return -1;

421

422

hdr = (const struct ieee802_1x_hdr *) buf;

423

key = (const struct wpa_eapol_key *) (hdr + 1);

424

plen = be_to_host16(hdr->length);

425

426

if (hdr->version < EAPOL_VERSION) {

427

/* TODO: backwards compatibility */

428

}

429

if (hdr->type != IEEE802_1X_TYPE_EAPOL_KEY) {

430

wpa_printf(MSG_DEBUG, "RSN: EAPOL frame (type %u) discarded, "

431

"not a Key frame", hdr->type);

432

return -1;

433

}

434

if (plen > len - sizeof(*hdr) || plen < sizeof(*key)) {

435

wpa_printf(MSG_DEBUG, "RSN: EAPOL frame payload size %lu "

436

"invalid (frame size %lu)",

437

(unsigned long) plen, (unsigned long) len);

438

return -1;

439

}

440

441

if (key->type != EAPOL_KEY_TYPE_RSN) {

442

wpa_printf(MSG_DEBUG, "RSN: EAPOL-Key type (%d) unknown, "

443

"discarded", key->type);

444

return -1;

445

}

446

447

key_info = WPA_GET_BE16(key->key_info);

448

449

return !!(key_info & WPA_KEY_INFO_ACK);

450

}

451

452

453

static int ibss_rsn_process_rx_eapol(struct ibss_rsn *ibss_rsn,

454

struct ibss_rsn_peer *peer,

455

const u8 *buf, size_t len)

456

{

457

int supp;

458

u8 *tmp;

459

460

supp = ibss_rsn_eapol_dst_supp(buf, len);

461

if (supp < 0)

462

return -1;

463

464

tmp = os_malloc(len);

465

if (tmp == NULL)

466

return -1;

467

os_memcpy(tmp, buf, len);

468

if (supp) {

469

wpa_printf(MSG_DEBUG, "RSN: IBSS RX EAPOL for Supplicant");

470

wpa_sm_rx_eapol(peer->supp, peer->addr, tmp, len);

471

} else {

472

wpa_printf(MSG_DEBUG, "RSN: IBSS RX EAPOL for Authenticator");

473

wpa_receive(ibss_rsn->auth_group, peer->auth, tmp, len);

474

}

475

os_free(tmp);

476

477

return 1;

478

}

479

480

481

int ibss_rsn_rx_eapol(struct ibss_rsn *ibss_rsn, const u8 *src_addr,

482

const u8 *buf, size_t len)

483

{

484

struct ibss_rsn_peer *peer;

485

486

for (peer = ibss_rsn->peers; peer; peer = peer->next) {

487

if (os_memcmp(src_addr, peer->addr, ETH_ALEN) == 0)

488

return ibss_rsn_process_rx_eapol(ibss_rsn, peer,

489

buf, len);

490

}

491

492

if (ibss_rsn_eapol_dst_supp(buf, len) > 0) {

493

494

* Create new IBSS peer based on an EAPOL message from the peer

495

* Authenticator.

496

497

if (ibss_rsn_start(ibss_rsn, src_addr) < 0)

498

return -1;

499

return ibss_rsn_process_rx_eapol(ibss_rsn, ibss_rsn->peers,

500

buf, len);

501

}

502

503

return 0;

504

}

505

506

507

void ibss_rsn_set_psk(struct ibss_rsn *ibss_rsn, const u8 *psk)

508

{

509

os_memcpy(ibss_rsn->psk, psk, PMK_LEN);

510

}

Older »