~ubuntu-branches/ubuntu/precise/wpasupplicant/precise-security

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

* hostapd / RADIUS message processing

* RADIUS message processing

* 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

* See README and COPYING for more details.

#include "includes.h"

#include "utils/includes.h"

#include "common.h"

#include "utils/common.h"

#include "utils/wpabuf.h"

#include "crypto/md5.h"

#include "crypto/crypto.h"

#include "radius.h"

#include "md5.h"

#include "crypto.h"

/**

* struct radius_msg - RADIUS message structure for new and parsed messages

struct radius_msg {

/**

* buf - Allocated buffer for RADIUS message

struct wpabuf *buf;

/**

* hdr - Pointer to the RADIUS header in buf

struct radius_hdr *hdr;

/**

* attr_pos - Array of indexes to attributes

* The values are number of bytes from buf to the beginning of

* struct radius_attr_hdr.

size_t *attr_pos;

/**

* attr_size - Total size of the attribute pointer array

size_t attr_size;

/**

* attr_used - Total number of attributes in the array

size_t attr_used;

};

struct radius_hdr * radius_msg_get_hdr(struct radius_msg *msg)

{

return msg->hdr;

}

struct wpabuf * radius_msg_get_buf(struct radius_msg *msg)

{

return msg->buf;

}

static struct radius_attr_hdr *

radius_get_attr_hdr(struct radius_msg *msg, int idx)

{

return (struct radius_attr_hdr *) (msg->buf + msg->attr_pos[idx]);

}

struct radius_msg *radius_msg_new(u8 code, u8 identifier)

{

struct radius_msg *msg;

msg = os_malloc(sizeof(*msg));

if (msg == NULL)

return NULL;

if (radius_msg_initialize(msg, RADIUS_DEFAULT_MSG_SIZE)) {

os_free(msg);

return NULL;

}

radius_msg_set_hdr(msg, code, identifier);

return msg;

}

int radius_msg_initialize(struct radius_msg *msg, size_t init_len)

{

if (msg == NULL || init_len < sizeof(struct radius_hdr))

return -1;

os_memset(msg, 0, sizeof(*msg));

msg->buf = os_zalloc(init_len);

if (msg->buf == NULL)

return -1;

msg->buf_size = init_len;

msg->hdr = (struct radius_hdr *) msg->buf;

msg->buf_used = sizeof(*msg->hdr);

return (struct radius_attr_hdr *)

(wpabuf_mhead_u8(msg->buf) + msg->attr_pos[idx]);

}

static void radius_msg_set_hdr(struct radius_msg *msg, u8 code, u8 identifier)

{

msg->hdr->code = code;

msg->hdr->identifier = identifier;

}

static int radius_msg_initialize(struct radius_msg *msg)

{

msg->attr_pos =

os_zalloc(RADIUS_DEFAULT_ATTR_COUNT * sizeof(*msg->attr_pos));

if (msg->attr_pos == NULL) {

os_free(msg->buf);

msg->buf = NULL;

msg->hdr = NULL;

if (msg->attr_pos == NULL)

return -1;

}

msg->attr_size = RADIUS_DEFAULT_ATTR_COUNT;

msg->attr_used = 0;

}

void radius_msg_set_hdr(struct radius_msg *msg, u8 code, u8 identifier)

/**

100

* radius_msg_new - Create a new RADIUS message

101

* @code: Code for RADIUS header

102

* @identifier: Identifier for RADIUS header

103

* Returns: Context for RADIUS message or %NULL on failure

104

105

* The caller is responsible for freeing the returned data with

106

* radius_msg_free().

107

108

struct radius_msg * radius_msg_new(u8 code, u8 identifier)

109

{

msg->hdr->code = code;

msg->hdr->identifier = identifier;

110

struct radius_msg *msg;

111

112

msg = os_zalloc(sizeof(*msg));

113

if (msg == NULL)

114

return NULL;

115

116

msg->buf = wpabuf_alloc(RADIUS_DEFAULT_MSG_SIZE);

117

if (msg->buf == NULL || radius_msg_initialize(msg)) {

118

radius_msg_free(msg);

119

return NULL;

120

}

121

msg->hdr = wpabuf_put(msg->buf, sizeof(struct radius_hdr));

122

123

radius_msg_set_hdr(msg, code, identifier);

124

125

return msg;

126

}

127

128

129

/**

130

* radius_msg_free - Free a RADIUS message

131

* @msg: RADIUS message from radius_msg_new() or radius_msg_parse()

132

133

void radius_msg_free(struct radius_msg *msg)

134

{

os_free(msg->buf);

msg->buf = NULL;

msg->hdr = NULL;

msg->buf_size = msg->buf_used = 0;

135

if (msg == NULL)

136

return;

137

138

wpabuf_free(msg->buf);

139

os_free(msg->attr_pos);

msg->attr_pos = NULL;

msg->attr_size = msg->attr_used = 0;

140

os_free(msg);

141

}

142

143

305

350

RADIUS_ATTR_MESSAGE_AUTHENTICATOR,

306

351

auth, MD5_MAC_LEN);

307

352

if (attr == NULL) {

308

printf("WARNING: Could not add "

309

"Message-Authenticator\n");

353

wpa_printf(MSG_WARNING, "RADIUS: Could not add "

354

"Message-Authenticator");

310

355

return -1;

311

356

}

312

msg->hdr->length = htons(msg->buf_used);

313

hmac_md5(secret, secret_len, msg->buf, msg->buf_used,

314

(u8 *) (attr + 1));

357

msg->hdr->length = htons(wpabuf_len(msg->buf));

358

hmac_md5(secret, secret_len, wpabuf_head(msg->buf),

359

wpabuf_len(msg->buf), (u8 *) (attr + 1));

315

360

} else

316

msg->hdr->length = htons(msg->buf_used);

361

msg->hdr->length = htons(wpabuf_len(msg->buf));

317

362

318

if (msg->buf_used > 0xffff) {

319

printf("WARNING: too long RADIUS message (%lu)\n",

320

(unsigned long) msg->buf_used);

363

if (wpabuf_len(msg->buf) > 0xffff) {

364

wpa_printf(MSG_WARNING, "RADIUS: Too long message (%lu)",

365

(unsigned long) wpabuf_len(msg->buf));

321

366

return -1;

322

367

}

323

368

return 0;

339

384

printf("WARNING: Could not add Message-Authenticator\n");

340

385

return -1;

341

386

}

342

msg->hdr->length = htons(msg->buf_used);

387

msg->hdr->length = htons(wpabuf_len(msg->buf));

343

388

os_memcpy(msg->hdr->authenticator, req_authenticator,

344

389

sizeof(msg->hdr->authenticator));

345

hmac_md5(secret, secret_len, msg->buf, msg->buf_used,

346

(u8 *) (attr + 1));

390

hmac_md5(secret, secret_len, wpabuf_head(msg->buf),

391

wpabuf_len(msg->buf), (u8 *) (attr + 1));

347

392

348

393

/* ResponseAuth = MD5(Code+ID+Length+RequestAuth+Attributes+Secret) */

349

394

addr[0] = (u8 *) msg->hdr;

350

395

len[0] = 1 + 1 + 2;

351

396

addr[1] = req_authenticator;

352

397

len[1] = MD5_MAC_LEN;

353

addr[2] = (u8 *) (msg->hdr + 1);

354

len[2] = msg->buf_used - sizeof(*msg->hdr);

398

addr[2] = wpabuf_head_u8(msg->buf) + sizeof(struct radius_hdr);

399

len[2] = wpabuf_len(msg->buf) - sizeof(struct radius_hdr);

355

400

addr[3] = secret;

356

401

len[3] = secret_len;

357

402

md5_vector(4, addr, len, msg->hdr->authenticator);

358

403

359

if (msg->buf_used > 0xffff) {

360

printf("WARNING: too long RADIUS message (%lu)\n",

361

(unsigned long) msg->buf_used);

404

if (wpabuf_len(msg->buf) > 0xffff) {

405

wpa_printf(MSG_WARNING, "RADIUS: Too long message (%lu)",

406

(unsigned long) wpabuf_len(msg->buf));

362

407

return -1;

363

408

}

364

409

return 0;

371

416

const u8 *addr[2];

372

417

size_t len[2];

373

418

374

msg->hdr->length = htons(msg->buf_used);

419

msg->hdr->length = htons(wpabuf_len(msg->buf));

375

420

os_memset(msg->hdr->authenticator, 0, MD5_MAC_LEN);

376

addr[0] = msg->buf;

377

len[0] = msg->buf_used;

421

addr[0] = wpabuf_head(msg->buf);

422

len[0] = wpabuf_len(msg->buf);

378

423

addr[1] = secret;

379

424

len[1] = secret_len;

380

425

md5_vector(2, addr, len, msg->hdr->authenticator);

381

426

382

if (msg->buf_used > 0xffff) {

383

printf("WARNING: too long RADIUS messages (%lu)\n",

384

(unsigned long) msg->buf_used);

427

if (wpabuf_len(msg->buf) > 0xffff) {

428

wpa_printf(MSG_WARNING, "RADIUS: Too long messages (%lu)",

429

(unsigned long) wpabuf_len(msg->buf));

385

430

}

386

431

}

387

432

402

447

msg->attr_size = nlen;

403

448

}

404

449

405

msg->attr_pos[msg->attr_used++] = (unsigned char *) attr - msg->buf;

450

msg->attr_pos[msg->attr_used++] =

451

(unsigned char *) attr - wpabuf_head_u8(msg->buf);

406

452

407

453

return 0;

408

454

}

420

466

return NULL;

421

467

}

422

468

423

buf_needed = msg->buf_used + sizeof(*attr) + data_len;

469

buf_needed = sizeof(*attr) + data_len;

424

470

425

if (msg->buf_size < buf_needed) {

471

if (wpabuf_tailroom(msg->buf) < buf_needed) {

426

472

/* allocate more space for message buffer */

427

unsigned char *nbuf;

428

size_t nlen = msg->buf_size;

429

430

while (nlen < buf_needed)

431

nlen *= 2;

432

nbuf = os_realloc(msg->buf, nlen);

433

if (nbuf == NULL)

473

if (wpabuf_resize(&msg->buf, buf_needed) < 0)

434

474

return NULL;

435

msg->buf = nbuf;

436

msg->hdr = (struct radius_hdr *) msg->buf;

437

os_memset(msg->buf + msg->buf_size, 0, nlen - msg->buf_size);

438

msg->buf_size = nlen;

475

msg->hdr = wpabuf_mhead(msg->buf);

439

476

}

440

477

441

attr = (struct radius_attr_hdr *) (msg->buf + msg->buf_used);

478

attr = wpabuf_put(msg->buf, sizeof(struct radius_attr_hdr));

442

479

attr->type = type;

443

480

attr->length = sizeof(*attr) + data_len;

444

if (data_len > 0)

445

os_memcpy(attr + 1, data, data_len);

446

447

msg->buf_used += sizeof(*attr) + data_len;

481

wpabuf_put_data(msg->buf, data, data_len);

448

482

449

483

if (radius_msg_add_attr_to_array(msg, attr))

450

484

return NULL;

453

487

}

454

488

455

489

456

struct radius_msg *radius_msg_parse(const u8 *data, size_t len)

490

/**

491

* radius_msg_parse - Parse a RADIUS message

492

* @data: RADIUS message to be parsed

493

* @len: Length of data buffer in octets

494

* Returns: Parsed RADIUS message or %NULL on failure

495

496

* This parses a RADIUS message and makes a copy of its data. The caller is

497

* responsible for freeing the returned data with radius_msg_free().

498

499

struct radius_msg * radius_msg_parse(const u8 *data, size_t len)

457

500

{

458

501

struct radius_msg *msg;

459

502

struct radius_hdr *hdr;

468

511

469

512

msg_len = ntohs(hdr->length);

470

513

if (msg_len < sizeof(*hdr) || msg_len > len) {

471

printf("Invalid RADIUS message length\n");

514

wpa_printf(MSG_INFO, "RADIUS: Invalid message length");

472

515

return NULL;

473

516

}

474

517

475

518

if (msg_len < len) {

476

printf("Ignored %lu extra bytes after RADIUS message\n",

477

(unsigned long) len - msg_len);

519

wpa_printf(MSG_DEBUG, "RADIUS: Ignored %lu extra bytes after "

520

"RADIUS message", (unsigned long) len - msg_len);

478

521

}

479

522

480

msg = os_malloc(sizeof(*msg));

523

msg = os_zalloc(sizeof(*msg));

481

524

if (msg == NULL)

482

525

return NULL;

483

526

484

if (radius_msg_initialize(msg, msg_len)) {

485

os_free(msg);

527

msg->buf = wpabuf_alloc_copy(data, msg_len);

528

if (msg->buf == NULL || radius_msg_initialize(msg)) {

529

radius_msg_free(msg);

486

530

return NULL;

487

531

}

488

489

os_memcpy(msg->buf, data, msg_len);

490

msg->buf_size = msg->buf_used = msg_len;

532

msg->hdr = wpabuf_mhead(msg->buf);

491

533

492

534

/* parse attributes */

493

pos = (unsigned char *) (msg->hdr + 1);

494

end = msg->buf + msg->buf_used;

535

pos = wpabuf_mhead_u8(msg->buf) + sizeof(struct radius_hdr);

536

end = wpabuf_mhead_u8(msg->buf) + wpabuf_len(msg->buf);

495

537

while (pos < end) {

496

538

if ((size_t) (end - pos) < sizeof(*attr))

497

539

goto fail;

513

555

514

556

fail:

515

557

radius_msg_free(msg);

516

os_free(msg);

517

558

return NULL;

518

559

}

519

560

615

656

os_memcpy(msg->hdr->authenticator, req_auth,

616

657

sizeof(msg->hdr->authenticator));

617

658

}

618

hmac_md5(secret, secret_len, msg->buf, msg->buf_used, auth);

659

hmac_md5(secret, secret_len, wpabuf_head(msg->buf),

660

wpabuf_len(msg->buf), auth);

619

661

os_memcpy(attr + 1, orig, MD5_MAC_LEN);

620

662

if (req_auth) {

621

663

os_memcpy(msg->hdr->authenticator, orig_authenticator,

654

696

len[0] = 1 + 1 + 2;

655

697

addr[1] = sent_msg->hdr->authenticator;

656

698

len[1] = MD5_MAC_LEN;

657

addr[2] = (u8 *) (msg->hdr + 1);

658

len[2] = msg->buf_used - sizeof(*msg->hdr);

699

addr[2] = wpabuf_head_u8(msg->buf) + sizeof(struct radius_hdr);

700

len[2] = wpabuf_len(msg->buf) - sizeof(struct radius_hdr);

659

701

addr[3] = secret;

660

702

len[3] = secret_len;

661

703

md5_vector(4, addr, len, hash);

1232

1274

1233

1275

return -1;

1234

1276

}

1277

1278

1279

void radius_free_class(struct radius_class_data *c)

1280

{

1281

size_t i;

1282

if (c == NULL)

1283

return;

1284

for (i = 0; i < c->count; i++)

1285

os_free(c->attr[i].data);

1286

os_free(c->attr);

1287

c->attr = NULL;

1288

c->count = 0;

1289

}

1290

1291

1292

int radius_copy_class(struct radius_class_data *dst,

1293

const struct radius_class_data *src)

1294

{

1295

size_t i;

1296

1297

if (src->attr == NULL)

1298

return 0;

1299

1300

dst->attr = os_zalloc(src->count * sizeof(struct radius_attr_data));

1301

if (dst->attr == NULL)

1302

return -1;

1303

1304

dst->count = 0;

1305

1306

for (i = 0; i < src->count; i++) {

1307

dst->attr[i].data = os_malloc(src->attr[i].len);

1308

if (dst->attr[i].data == NULL)

1309

break;

1310

dst->count++;

1311

os_memcpy(dst->attr[i].data, src->attr[i].data,

1312

src->attr[i].len);

1313

dst->attr[i].len = src->attr[i].len;

1314

}

1315

1316

return 0;

1317

}

Older »