~ubuntu-branches/ubuntu/wily/wpasupplicant/wily

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/crypto/tls_nss.c

* SSL/TLS interface functions for NSS

* 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 <nspr/prtypes.h>

#include <nspr/plarenas.h>

#include <nspr/plhash.h>

#include <nspr/prio.h>

#include <nspr/prclist.h>

#include <nspr/prlock.h>

#include <nspr/prinit.h>

#include <nspr/prerror.h>

#include <nspr/prmem.h>

#include <nss/nss.h>

#include <nss/nssilckt.h>

#include <nss/ssl.h>

#include <nss/pk11func.h>

#include <nss/secerr.h>

#include "common.h"

#include "tls.h"

static int tls_nss_ref_count = 0;

static PRDescIdentity nss_layer_id;

struct tls_connection {

PRFileDesc *fd;

int established;

int verify_peer;

u8 *push_buf, *pull_buf, *pull_buf_offset;

size_t push_buf_len, pull_buf_len;

};

static PRStatus nss_io_close(PRFileDesc *fd)

{

wpa_printf(MSG_DEBUG, "NSS: I/O close");

return PR_SUCCESS;

}

static PRInt32 nss_io_read(PRFileDesc *fd, void *buf, PRInt32 amount)

{

wpa_printf(MSG_DEBUG, "NSS: I/O read(%d)", amount);

return PR_FAILURE;

}

static PRInt32 nss_io_write(PRFileDesc *fd, const void *buf, PRInt32 amount)

{

wpa_printf(MSG_DEBUG, "NSS: I/O write(%d)", amount);

return PR_FAILURE;

}

static PRInt32 nss_io_writev(PRFileDesc *fd, const PRIOVec *iov,

PRInt32 iov_size, PRIntervalTime timeout)

{

wpa_printf(MSG_DEBUG, "NSS: I/O writev(%d)", iov_size);

return PR_FAILURE;

}

static PRInt32 nss_io_recv(PRFileDesc *fd, void *buf, PRInt32 amount,

PRIntn flags, PRIntervalTime timeout)

{

struct tls_connection *conn = (struct tls_connection *) fd->secret;

u8 *end;

wpa_printf(MSG_DEBUG, "NSS: I/O recv(%d)", amount);

if (conn->pull_buf == NULL) {

wpa_printf(MSG_DEBUG, "NSS: No data available to be read yet");

return PR_FAILURE;

}

end = conn->pull_buf + conn->pull_buf_len;

if (end - conn->pull_buf_offset < amount)

amount = end - conn->pull_buf_offset;

os_memcpy(buf, conn->pull_buf_offset, amount);

conn->pull_buf_offset += amount;

if (conn->pull_buf_offset == end) {

wpa_printf(MSG_DEBUG, "%s - pull_buf consumed", __func__);

os_free(conn->pull_buf);

conn->pull_buf = conn->pull_buf_offset = NULL;

100

conn->pull_buf_len = 0;

101

} else {

102

wpa_printf(MSG_DEBUG, "%s - %lu bytes remaining in pull_buf",

103

__func__,

104

(unsigned long) (end - conn->pull_buf_offset));

105

}

106

return amount;

107

}

108

109

110

static PRInt32 nss_io_send(PRFileDesc *fd, const void *buf, PRInt32 amount,

111

PRIntn flags, PRIntervalTime timeout)

112

{

113

struct tls_connection *conn = (struct tls_connection *) fd->secret;

114

u8 *nbuf;

115

116

wpa_printf(MSG_DEBUG, "NSS: I/O %s", __func__);

117

wpa_hexdump(MSG_MSGDUMP, "NSS: I/O send data", buf, amount);

118

119

nbuf = os_realloc(conn->push_buf, conn->push_buf_len + amount);

120

if (nbuf == NULL) {

121

wpa_printf(MSG_ERROR, "NSS: Failed to allocate memory for the "

122

"data to be sent");

123

return PR_FAILURE;

124

}

125

os_memcpy(nbuf + conn->push_buf_len, buf, amount);

126

conn->push_buf = nbuf;

127

conn->push_buf_len += amount;

128

129

return amount;

130

}

131

132

133

static PRInt32 nss_io_recvfrom(PRFileDesc *fd, void *buf, PRInt32 amount,

134

PRIntn flags, PRNetAddr *addr,

135

PRIntervalTime timeout)

136

{

137

wpa_printf(MSG_DEBUG, "NSS: I/O %s", __func__);

138

return PR_FAILURE;

139

}

140

141

142

static PRInt32 nss_io_sendto(PRFileDesc *fd, const void *buf, PRInt32 amount,

143

PRIntn flags, const PRNetAddr *addr,

144

PRIntervalTime timeout)

145

{

146

wpa_printf(MSG_DEBUG, "NSS: I/O %s", __func__);

147

return PR_FAILURE;

148

}

149

150

151

static PRStatus nss_io_getpeername(PRFileDesc *fd, PRNetAddr *addr)

152

{

153

wpa_printf(MSG_DEBUG, "NSS: I/O getpeername");

154

155

156

* It Looks like NSS only supports IPv4 and IPv6 TCP sockets. Provide a

157

* fake IPv4 address to work around this even though we are not really

158

* using TCP.

159

160

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

161

addr->inet.family = PR_AF_INET;

162

163

return PR_SUCCESS;

164

}

165

166

167

static PRStatus nss_io_getsocketoption(PRFileDesc *fd,

168

PRSocketOptionData *data)

169

{

170

switch (data->option) {

171

case PR_SockOpt_Nonblocking:

172

wpa_printf(MSG_DEBUG, "NSS: I/O getsocketoption(Nonblocking)");

173

data->value.non_blocking = PR_TRUE;

174

return PR_SUCCESS;

175

default:

176

wpa_printf(MSG_DEBUG, "NSS: I/O getsocketoption(%d)",

177

data->option);

178

return PR_FAILURE;

179

}

180

}

181

182

183

static const PRIOMethods nss_io = {

184

PR_DESC_LAYERED,

185

nss_io_close,

186

nss_io_read,

187

nss_io_write,

188

NULL /* available */,

189

NULL /* available64 */,

190

NULL /* fsync */,

191

NULL /* fseek */,

192

NULL /* fseek64 */,

193

NULL /* fileinfo */,

194

NULL /* fileinfo64 */,

195

nss_io_writev,

196

NULL /* connect */,

197

NULL /* accept */,

198

NULL /* bind */,

199

NULL /* listen */,

200

NULL /* shutdown */,

201

nss_io_recv,

202

nss_io_send,

203

nss_io_recvfrom,

204

nss_io_sendto,

205

NULL /* poll */,

206

NULL /* acceptread */,

207

NULL /* transmitfile */,

208

NULL /* getsockname */,

209

nss_io_getpeername,

210

NULL /* reserved_fn_6 */,

211

NULL /* reserved_fn_5 */,

212

nss_io_getsocketoption,

213

NULL /* setsocketoption */,

214

NULL /* sendfile */,

215

NULL /* connectcontinue */,

216

NULL /* reserved_fn_3 */,

217

NULL /* reserved_fn_2 */,

218

NULL /* reserved_fn_1 */,

219

NULL /* reserved_fn_0 */

220

};

221

222

223

static char * nss_password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)

224

{

225

wpa_printf(MSG_ERROR, "NSS: TODO - %s", __func__);

226

return NULL;

227

}

228

229

230

void * tls_init(const struct tls_config *conf)

231

{

232

char *dir;

233

234

tls_nss_ref_count++;

235

if (tls_nss_ref_count > 1)

236

return (void *) 1;

237

238

PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);

239

240

nss_layer_id = PR_GetUniqueIdentity("wpa_supplicant");

241

242

PK11_SetPasswordFunc(nss_password_cb);

243

244

dir = getenv("SSL_DIR");

245

if (dir) {

246

if (NSS_Init(dir) != SECSuccess) {

247

wpa_printf(MSG_ERROR, "NSS: NSS_Init(cert_dir=%s) "

248

"failed", dir);

249

return NULL;

250

}

251

} else {

252

if (NSS_NoDB_Init(NULL) != SECSuccess) {

253

wpa_printf(MSG_ERROR, "NSS: NSS_NoDB_Init(NULL) "

254

"failed");

255

return NULL;

256

}

257

}

258

259

if (SSL_OptionSetDefault(SSL_V2_COMPATIBLE_HELLO, PR_FALSE) !=

260

SECSuccess ||

261

SSL_OptionSetDefault(SSL_ENABLE_SSL3, PR_FALSE) != SECSuccess ||

262

SSL_OptionSetDefault(SSL_ENABLE_SSL2, PR_FALSE) != SECSuccess ||

263

SSL_OptionSetDefault(SSL_ENABLE_TLS, PR_TRUE) != SECSuccess) {

264

wpa_printf(MSG_ERROR, "NSS: SSL_OptionSetDefault failed");

265

return NULL;

266

}

267

268

if (NSS_SetDomesticPolicy() != SECSuccess) {

269

wpa_printf(MSG_ERROR, "NSS: NSS_SetDomesticPolicy() failed");

270

return NULL;

271

}

272

273

return (void *) 1;

274

}

275

276

void tls_deinit(void *ssl_ctx)

277

{

278

tls_nss_ref_count--;

279

if (tls_nss_ref_count == 0) {

280

if (NSS_Shutdown() != SECSuccess)

281

wpa_printf(MSG_ERROR, "NSS: NSS_Shutdown() failed");

282

}

283

}

284

285

286

int tls_get_errors(void *tls_ctx)

287

{

288

return 0;

289

}

290

291

292

static SECStatus nss_bad_cert_cb(void *arg, PRFileDesc *fd)

293

{

294

struct tls_connection *conn = arg;

295

SECStatus res = SECSuccess;

296

PRErrorCode err;

297

CERTCertificate *cert;

298

char *subject, *issuer;

299

300

err = PR_GetError();

301

if (IS_SEC_ERROR(err))

302

wpa_printf(MSG_DEBUG, "NSS: Bad Server Certificate (sec err "

303

"%d)", err - SEC_ERROR_BASE);

304

else

305

wpa_printf(MSG_DEBUG, "NSS: Bad Server Certificate (err %d)",

306

err);

307

cert = SSL_PeerCertificate(fd);

308

subject = CERT_NameToAscii(&cert->subject);

309

issuer = CERT_NameToAscii(&cert->issuer);

310

wpa_printf(MSG_DEBUG, "NSS: Peer certificate subject='%s' issuer='%s'",

311

subject, issuer);

312

CERT_DestroyCertificate(cert);

313

PR_Free(subject);

314

PR_Free(issuer);

315

if (conn->verify_peer)

316

res = SECFailure;

317

318

return res;

319

}

320

321

322

static void nss_handshake_cb(PRFileDesc *fd, void *client_data)

323

{

324

struct tls_connection *conn = client_data;

325

wpa_printf(MSG_DEBUG, "NSS: Handshake completed");

326

conn->established = 1;

327

}

328

329

330

struct tls_connection * tls_connection_init(void *tls_ctx)

331

{

332

struct tls_connection *conn;

333

334

conn = os_zalloc(sizeof(*conn));

335

if (conn == NULL)

336

return NULL;

337

338

conn->fd = PR_CreateIOLayerStub(nss_layer_id, &nss_io);

339

if (conn->fd == NULL) {

340

os_free(conn);

341

return NULL;

342

}

343

conn->fd->secret = (void *) conn;

344

345

conn->fd = SSL_ImportFD(NULL, conn->fd);

346

if (conn->fd == NULL) {

347

os_free(conn);

348

return NULL;

349

}

350

351

if (SSL_OptionSet(conn->fd, SSL_SECURITY, PR_TRUE) != SECSuccess ||

352

SSL_OptionSet(conn->fd, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) !=

353

SECSuccess ||

354

SSL_OptionSet(conn->fd, SSL_HANDSHAKE_AS_SERVER, PR_FALSE) !=

355

SECSuccess ||

356

SSL_OptionSet(conn->fd, SSL_ENABLE_TLS, PR_TRUE) != SECSuccess ||

357

SSL_BadCertHook(conn->fd, nss_bad_cert_cb, conn) != SECSuccess ||

358

SSL_HandshakeCallback(conn->fd, nss_handshake_cb, conn) !=

359

SECSuccess) {

360

wpa_printf(MSG_ERROR, "NSS: Failed to set options");

361

PR_Close(conn->fd);

362

os_free(conn);

363

return NULL;

364

}

365

366

SSL_ResetHandshake(conn->fd, PR_FALSE);

367

368

return conn;

369

}

370

371

372

void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)

373

{

374

PR_Close(conn->fd);

375

os_free(conn->push_buf);

376

os_free(conn->pull_buf);

377

os_free(conn);

378

}

379

380

381

int tls_connection_established(void *tls_ctx, struct tls_connection *conn)

382

{

383

return conn->established;

384

}

385

386

387

int tls_connection_shutdown(void *tls_ctx, struct tls_connection *conn)

388

{

389

return -1;

390

}

391

392

393

int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,

394

const struct tls_connection_params *params)

395

{

396

wpa_printf(MSG_ERROR, "NSS: TODO - %s", __func__);

397

return 0;

398

}

399

400

401

int tls_global_set_params(void *tls_ctx,

402

const struct tls_connection_params *params)

403

{

404

return -1;

405

}

406

407

408

int tls_global_set_verify(void *tls_ctx, int check_crl)

409

{

410

return -1;

411

}

412

413

414

int tls_connection_set_verify(void *tls_ctx, struct tls_connection *conn,

415

int verify_peer)

416

{

417

conn->verify_peer = verify_peer;

418

return 0;

419

}

420

421

422

int tls_connection_set_ia(void *tls_ctx, struct tls_connection *conn,

423

int tls_ia)

424

{

425

return -1;

426

}

427

428

429

int tls_connection_get_keys(void *tls_ctx, struct tls_connection *conn,

430

struct tls_keys *keys)

431

{

432

/* NSS does not export master secret or client/server random. */

433

return -1;

434

}

435

436

437

int tls_connection_prf(void *tls_ctx, struct tls_connection *conn,

438

const char *label, int server_random_first,

439

u8 *out, size_t out_len)

440

{

441

if (conn == NULL || server_random_first) {

442

wpa_printf(MSG_INFO, "NSS: Unsupported PRF request "

443

"(server_random_first=%d)",

444

server_random_first);

445

return -1;

446

}

447

448

if (SSL_ExportKeyingMaterial(conn->fd, label, NULL, 0, out, out_len) !=

449

SECSuccess) {

450

wpa_printf(MSG_INFO, "NSS: Failed to use TLS extractor "

451

"(label='%s' out_len=%d", label, (int) out_len);

452

return -1;

453

}

454

455

return 0;

456

}

457

458

459

struct wpabuf * tls_connection_handshake(void *tls_ctx,

460

struct tls_connection *conn,

461

const struct wpabuf *in_data,

462

struct wpabuf **appl_data)

463

{

464

struct wpabuf *out_data;

465

466

wpa_printf(MSG_DEBUG, "NSS: handshake: in_len=%u",

467

in_data ? (unsigned int) wpabuf_len(in_data) : 0);

468

469

if (appl_data)

470

*appl_data = NULL;

471

472

if (in_data && wpabuf_len(in_data) > 0) {

473

if (conn->pull_buf) {

474

wpa_printf(MSG_DEBUG, "%s - %lu bytes remaining in "

475

"pull_buf", __func__,

476

(unsigned long) conn->pull_buf_len);

477

os_free(conn->pull_buf);

478

}

479

conn->pull_buf = os_malloc(wpabuf_len(in_data));

480

if (conn->pull_buf == NULL)

481

return NULL;

482

os_memcpy(conn->pull_buf, wpabuf_head(in_data),

483

wpabuf_len(in_data));

484

conn->pull_buf_offset = conn->pull_buf;

485

conn->pull_buf_len = wpabuf_len(in_data);

486

}

487

488

SSL_ForceHandshake(conn->fd);

489

490

if (conn->established && conn->push_buf == NULL) {

491

/* Need to return something to get final TLS ACK. */

492

conn->push_buf = os_malloc(1);

493

}

494

495

if (conn->push_buf == NULL)

496

return NULL;

497

out_data = wpabuf_alloc_ext_data(conn->push_buf, conn->push_buf_len);

498

if (out_data == NULL)

499

os_free(conn->push_buf);

500

conn->push_buf = NULL;

501

conn->push_buf_len = 0;

502

return out_data;

503

}

504

505

506

struct wpabuf * tls_connection_server_handshake(void *tls_ctx,

507

struct tls_connection *conn,

508

const struct wpabuf *in_data,

509

struct wpabuf **appl_data)

510

{

511

return NULL;

512

}

513

514

515

struct wpabuf * tls_connection_encrypt(void *tls_ctx,

516

struct tls_connection *conn,

517

const struct wpabuf *in_data)

518

{

519

PRInt32 res;

520

struct wpabuf *buf;

521

522

wpa_printf(MSG_DEBUG, "NSS: encrypt %d bytes",

523

(int) wpabuf_len(in_data));

524

res = PR_Send(conn->fd, wpabuf_head(in_data), wpabuf_len(in_data), 0,

525

0);

526

if (res < 0) {

527

wpa_printf(MSG_ERROR, "NSS: Encryption failed");

528

return NULL;

529

}

530

if (conn->push_buf == NULL)

531

return NULL;

532

buf = wpabuf_alloc_ext_data(conn->push_buf, conn->push_buf_len);

533

if (buf == NULL)

534

os_free(conn->push_buf);

535

conn->push_buf = NULL;

536

conn->push_buf_len = 0;

537

return buf;

538

}

539

540

541

struct wpabuf * tls_connection_decrypt(void *tls_ctx,

542

struct tls_connection *conn,

543

const struct wpabuf *in_data)

544

{

545

PRInt32 res;

546

struct wpabuf *out;

547

548

wpa_printf(MSG_DEBUG, "NSS: decrypt %d bytes",

549

(int) wpabuf_len(in_data));

550

if (conn->pull_buf) {

551

wpa_printf(MSG_DEBUG, "%s - %lu bytes remaining in "

552

"pull_buf", __func__,

553

(unsigned long) conn->pull_buf_len);

554

os_free(conn->pull_buf);

555

}

556

conn->pull_buf = os_malloc(wpabuf_len(in_data));

557

if (conn->pull_buf == NULL)

558

return NULL;

559

os_memcpy(conn->pull_buf, wpabuf_head(in_data), wpabuf_len(in_data));

560

conn->pull_buf_offset = conn->pull_buf;

561

conn->pull_buf_len = wpabuf_len(in_data);

562

563

564

* Even though we try to disable TLS compression, it is possible that

565

* this cannot be done with all TLS libraries. Add extra buffer space

566

* to handle the possibility of the decrypted data being longer than

567

* input data.

568

569

out = wpabuf_alloc((wpabuf_len(in_data) + 500) * 3);

570

if (out == NULL)

571

return NULL;

572

573

res = PR_Recv(conn->fd, wpabuf_mhead(out), wpabuf_size(out), 0, 0);

574

wpa_printf(MSG_DEBUG, "NSS: PR_Recv: %d", res);

575

if (res < 0) {

576

wpabuf_free(out);

577

return NULL;

578

}

579

wpabuf_put(out, res);

580

581

return out;

582

}

583

584

585

int tls_connection_resumed(void *tls_ctx, struct tls_connection *conn)

586

{

587

return 0;

588

}

589

590

591

int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,

592

u8 *ciphers)

593

{

594

return -1;

595

}

596

597

598

int tls_get_cipher(void *tls_ctx, struct tls_connection *conn,

599

char *buf, size_t buflen)

600

{

601

return -1;

602

}

603

604

605

int tls_connection_enable_workaround(void *tls_ctx,

606

struct tls_connection *conn)

607

{

608

return -1;

609

}

610

611

612

int tls_connection_client_hello_ext(void *tls_ctx, struct tls_connection *conn,

613

int ext_type, const u8 *data,

614

size_t data_len)

615

{

616

return -1;

617

}

618

619

620

int tls_connection_get_failed(void *tls_ctx, struct tls_connection *conn)

621

{

622

return 0;

623

}

624

625

626

int tls_connection_get_read_alerts(void *tls_ctx, struct tls_connection *conn)

627

{

628

return 0;

629

}

630

631

632

int tls_connection_get_write_alerts(void *tls_ctx,

633

struct tls_connection *conn)

634

{

635

return 0;

636

}

637

638

639

int tls_connection_get_keyblock_size(void *tls_ctx,

640

struct tls_connection *conn)

641

{

642

return -1;

643

}

644

645

646

unsigned int tls_capabilities(void *tls_ctx)

647

{

648

return 0;

649

}

650

651

652

struct wpabuf * tls_connection_ia_send_phase_finished(

653

void *tls_ctx, struct tls_connection *conn, int final)

654

{

655

return NULL;

656

}

657

658

659

int tls_connection_ia_final_phase_finished(void *tls_ctx,

660

struct tls_connection *conn)

661

{

662

return -1;

663

}

664

665

666

int tls_connection_ia_permute_inner_secret(void *tls_ctx,

667

struct tls_connection *conn,

668

const u8 *key, size_t key_len)

669

{

670

return -1;

671

}

672

673

674

int tls_connection_set_session_ticket_cb(void *tls_ctx,

675

struct tls_connection *conn,

676

tls_session_ticket_cb cb,

677

void *ctx)

678

{

679

return -1;

680

}

Older »