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

Viewing changes to src/eap_server/eap_psk.c

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

Tags: 0.7.3-0ubuntu1

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

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

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

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus

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

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

debian/wpasupplicant.lintian-overrides

src/ap

src/ap/Makefile

src/ap/accounting.c

src/ap/accounting.h

src/ap/ap_config.c

src/ap/ap_config.h

src/ap/ap_drv_ops.c

src/ap/ap_drv_ops.h

src/ap/ap_list.c

src/ap/ap_list.h

src/ap/ap_mlme.c

src/ap/ap_mlme.h

src/ap/authsrv.c

src/ap/authsrv.h

src/ap/beacon.c

src/ap/beacon.h

src/ap/ctrl_iface_ap.c

src/ap/ctrl_iface_ap.h

src/ap/drv_callbacks.c

src/ap/hostapd.c

src/ap/hostapd.h

src/ap/hw_features.c

src/ap/hw_features.h

src/ap/iapp.c

src/ap/iapp.h

src/ap/ieee802_11.c

src/ap/ieee802_11.h

src/ap/ieee802_11_auth.c

src/ap/ieee802_11_auth.h

src/ap/ieee802_11_ht.c

src/ap/ieee802_1x.c

src/ap/ieee802_1x.h

src/ap/peerkey_auth.c

src/ap/pmksa_cache_auth.c

src/ap/pmksa_cache_auth.h

src/ap/preauth_auth.c

src/ap/preauth_auth.h

src/ap/sta_info.c

src/ap/sta_info.h

src/ap/tkip_countermeasures.c

src/ap/tkip_countermeasures.h

src/ap/utils.c

src/ap/vlan_init.c

src/ap/vlan_init.h

src/ap/wmm.c

src/ap/wmm.h

src/ap/wpa_auth.c

src/ap/wpa_auth.h

src/ap/wpa_auth_ft.c

src/ap/wpa_auth_glue.c

src/ap/wpa_auth_glue.h

src/ap/wpa_auth_i.h

src/ap/wpa_auth_ie.c

src/ap/wpa_auth_ie.h

src/ap/wps_hostapd.c

src/ap/wps_hostapd.h

src/crypto/.gitignore

src/crypto/aes-cbc.c

src/crypto/aes-ctr.c

src/crypto/aes-eax.c

src/crypto/aes-encblock.c

src/crypto/aes-internal-dec.c

src/crypto/aes-internal-enc.c

src/crypto/aes-internal.c

src/crypto/aes-omac1.c

src/crypto/aes-unwrap.c

src/crypto/aes-wrap.c

src/crypto/aes_i.h

src/crypto/crypto_internal-cipher.c

src/crypto/crypto_internal-modexp.c

src/crypto/crypto_internal-rsa.c

src/crypto/crypto_nss.c

src/crypto/des-internal.c

src/crypto/des_i.h

src/crypto/dh_group5.c

src/crypto/dh_group5.h

src/crypto/fips_prf_cryptoapi.c

src/crypto/fips_prf_gnutls.c

src/crypto/fips_prf_internal.c

src/crypto/fips_prf_nss.c

src/crypto/fips_prf_openssl.c

src/crypto/md4-internal.c

src/crypto/md5-internal.c

src/crypto/md5-non-fips.c

src/crypto/md5_i.h

src/crypto/milenage.c

src/crypto/milenage.h

src/crypto/sha1-internal.c

src/crypto/sha1-pbkdf2.c

src/crypto/sha1-tlsprf.c

src/crypto/sha1-tprf.c

src/crypto/sha1_i.h

src/crypto/sha256-internal.c

src/crypto/tls_nss.c

src/drivers/.gitignore

src/drivers/driver_atheros.c

src/drivers/driver_none.c

src/drivers/drivers.mak

src/drivers/linux_ioctl.c

src/drivers/linux_ioctl.h

src/drivers/netlink.c

src/drivers/netlink.h

src/drivers/nl80211_copy.h

src/drivers/wireless_copy.h

src/eap_server/eap_server.c

src/eap_server/eap_server_aka.c

src/eap_server/eap_server_fast.c

src/eap_server/eap_server_gpsk.c

src/eap_server/eap_server_gtc.c

src/eap_server/eap_server_identity.c

src/eap_server/eap_server_ikev2.c

src/eap_server/eap_server_md5.c

src/eap_server/eap_server_methods.c

src/eap_server/eap_server_mschapv2.c

src/eap_server/eap_server_pax.c

src/eap_server/eap_server_peap.c

src/eap_server/eap_server_psk.c

src/eap_server/eap_server_sake.c

src/eap_server/eap_server_sim.c

src/eap_server/eap_server_tls.c

src/eap_server/eap_server_tls_common.c

src/eap_server/eap_server_tnc.c

src/eap_server/eap_server_ttls.c

src/eap_server/eap_server_vendor_test.c

src/eap_server/eap_server_wsc.c

src/eapol_auth

src/eapol_auth/Makefile

src/eapol_auth/eapol_auth_dump.c

src/eapol_auth/eapol_auth_sm.c

src/eapol_auth/eapol_auth_sm.h

src/eapol_auth/eapol_auth_sm_i.h

src/lib.rules

src/radius/.gitignore

src/tls/.gitignore

src/tls/pkcs1.c

src/tls/pkcs1.h

src/tls/pkcs5.c

src/tls/pkcs5.h

src/tls/pkcs8.c

src/tls/pkcs8.h

src/utils/.gitignore

src/utils/list.h

src/utils/radiotap.c

src/utils/radiotap.h

src/utils/radiotap_iter.h

src/utils/trace.c

src/utils/trace.h

src/wps/http.h

src/wps/http_client.c

src/wps/http_client.h

src/wps/http_server.c

src/wps/http_server.h

src/wps/ndef.c

src/wps/upnp_xml.c

src/wps/upnp_xml.h

src/wps/wps_er.c

src/wps/wps_er.h

src/wps/wps_er_ssdp.c

src/wps/wps_nfc.c

src/wps/wps_nfc_pn531.c

src/wps/wps_ufd.c

src/wps/wps_upnp_ap.c

wpa_supplicant/ap.c

wpa_supplicant/ap.h

wpa_supplicant/bgscan.c

wpa_supplicant/bgscan.h

wpa_supplicant/bgscan_simple.c

wpa_supplicant/bss.c

wpa_supplicant/bss.h

wpa_supplicant/dbus

wpa_supplicant/dbus/.gitignore

wpa_supplicant/dbus/Makefile

wpa_supplicant/dbus/dbus-wpa_supplicant.conf

wpa_supplicant/dbus/dbus_common.c

wpa_supplicant/dbus/dbus_common.h

wpa_supplicant/dbus/dbus_common_i.h

wpa_supplicant/dbus/dbus_dict_helpers.c

wpa_supplicant/dbus/dbus_dict_helpers.h

wpa_supplicant/dbus/dbus_new.c

wpa_supplicant/dbus/dbus_new.h

wpa_supplicant/dbus/dbus_new_handlers.c

wpa_supplicant/dbus/dbus_new_handlers.h

wpa_supplicant/dbus/dbus_new_handlers_wps.c

wpa_supplicant/dbus/dbus_new_helpers.c

wpa_supplicant/dbus/dbus_new_helpers.h

wpa_supplicant/dbus/dbus_new_introspect.c

wpa_supplicant/dbus/dbus_old.c

wpa_supplicant/dbus/dbus_old.h

wpa_supplicant/dbus/dbus_old_handlers.c

wpa_supplicant/dbus/dbus_old_handlers.h

wpa_supplicant/dbus/dbus_old_handlers_wps.c

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

wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service

wpa_supplicant/driver_i.h

wpa_supplicant/eap_register.c

wpa_supplicant/examples/60_wpa_supplicant

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

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

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

wpa_supplicant/examples/wpas-dbus-new.py

wpa_supplicant/ibss_rsn.c

wpa_supplicant/ibss_rsn.h

wpa_supplicant/notify.c

wpa_supplicant/notify.h

wpa_supplicant/scan.h

wpa_supplicant/sme.c

wpa_supplicant/sme.h

wpa_supplicant/wpa_gui-qt4/icons/ap.svg

wpa_supplicant/wpa_gui-qt4/icons/laptop.svg

wpa_supplicant/wpa_gui-qt4/lang

wpa_supplicant/wpa_gui-qt4/lang/.gitignore

wpa_supplicant/wpa_gui-qt4/lang/wpa_gui_de.ts

wpa_supplicant/wpa_gui-qt4/peers.cpp

wpa_supplicant/wpa_gui-qt4/peers.h

wpa_supplicant/wpa_gui-qt4/peers.ui

wpa_supplicant/wpa_gui-qt4/stringquery.cpp

wpa_supplicant/wpa_gui-qt4/stringquery.h

wpa_supplicant/xcode

wpa_supplicant/xcode/wpa_supplicant.xcodeproj

wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj

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

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

.pc/11_syslog.patch

.pc/11_syslog.patch/src

.pc/11_syslog.patch/src/utils

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

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

.pc/11_syslog.patch/wpa_supplicant

.pc/11_syslog.patch/wpa_supplicant/Makefile

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

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

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

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant

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

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

.pc/20_wpa_msg_ctrl_wps.patch

.pc/20_wpa_msg_ctrl_wps.patch/wpa_supplicant

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

.pc/21_kfreebsd.patch

.pc/21_kfreebsd.patch/src

.pc/21_kfreebsd.patch/src/drivers

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

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

.pc/21_kfreebsd.patch/src/l2_packet

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

.pc/21_kfreebsd.patch/src/utils

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

.pc/21_kfreebsd.patch/src/wps

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

.pc/21_kfreebsd.patch/wpa_supplicant

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

.pc/30_cfg80211_association_optimisation.patch

.pc/30_cfg80211_association_optimisation.patch/src

.pc/30_cfg80211_association_optimisation.patch/src/drivers

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

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

src/common/nl80211_copy.h

src/common/wireless_copy.h

src/crypto/aes.c

src/crypto/aes_wrap.c

src/crypto/des.c

src/crypto/md4.c

src/crypto/rc4.h

src/drivers/driver_prism54.c

src/drivers/driver_ps3.c

src/drivers/radiotap.c

src/drivers/radiotap.h

src/drivers/radiotap_iter.h

src/drivers/scan_helpers.c

src/eap_server/eap.c

src/eap_server/eap_aka.c

src/eap_server/eap_fast.c

src/eap_server/eap_gpsk.c

src/eap_server/eap_gtc.c

src/eap_server/eap_identity.c

src/eap_server/eap_ikev2.c

src/eap_server/eap_md5.c

src/eap_server/eap_methods.c

src/eap_server/eap_mschapv2.c

src/eap_server/eap_pax.c

src/eap_server/eap_peap.c

src/eap_server/eap_psk.c

src/eap_server/eap_sake.c

src/eap_server/eap_sim.c

src/eap_server/eap_tls.c

src/eap_server/eap_tls_common.c

src/eap_server/eap_tnc.c

src/eap_server/eap_ttls.c

src/eap_server/eap_vendor_test.c

src/eap_server/eap_wsc.c

src/hlr_auc_gw

src/hlr_auc_gw/Makefile

src/hlr_auc_gw/hlr_auc_gw.c

src/hlr_auc_gw/hlr_auc_gw.milenage_db

src/hlr_auc_gw/milenage.c

src/hlr_auc_gw/milenage.h

src/tls/asn1_test.c

wpa_supplicant/ctrl_iface_dbus.c

wpa_supplicant/ctrl_iface_dbus.h

wpa_supplicant/ctrl_iface_dbus_handlers.c

wpa_supplicant/ctrl_iface_dbus_handlers.h

wpa_supplicant/dbus-wpa_supplicant.conf

wpa_supplicant/dbus-wpa_supplicant.service

wpa_supplicant/dbus_dict_helpers.c

wpa_supplicant/dbus_dict_helpers.h

wpa_supplicant/doc/.gitignore

wpa_supplicant/doc/code_structure.doxygen

wpa_supplicant/doc/ctrl_iface.doxygen

wpa_supplicant/doc/doxygen.fast

wpa_supplicant/doc/doxygen.full

wpa_supplicant/doc/driver_wrapper.doxygen

wpa_supplicant/doc/eap.doxygen

wpa_supplicant/doc/kerneldoc2doxygen.pl

wpa_supplicant/doc/mainpage.doxygen

wpa_supplicant/doc/porting.doxygen

wpa_supplicant/doc/testing_tools.doxygen

wpa_supplicant/doc/wpa_supplicant.fig

wpa_supplicant/tests/test_aes.c

wpa_supplicant/tests/test_md4.c

wpa_supplicant/tests/test_md5.c

wpa_supplicant/tests/test_ms_funcs.c

wpa_supplicant/tests/test_sha1.c

wpa_supplicant/tests/test_sha256.c

wpa_supplicant/tests/test_x509v3.c

wpa_supplicant/tests/test_x509v3_nist.sh

wpa_supplicant/tests/test_x509v3_nist2.sh

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

.pc/applied-patches

debian/changelog

debian/compat

debian/config/kfreebsd

debian/config/linux

debian/control

debian/copyright

debian/ifupdown/action_wpa.sh

debian/ifupdown/functions.sh

debian/ifupdown/wpa_action

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

debian/patches/02_dbus_group_policy.patch

debian/patches/07_dbus_service_syslog.patch

debian/patches/series

debian/rules

debian/watch

debian/wpasupplicant.links

src/Makefile

src/common/Makefile

src/common/defs.h

src/common/ieee802_11_common.c

src/common/ieee802_11_common.h

src/common/ieee802_11_defs.h

src/common/privsep_commands.h

src/common/version.h

src/common/wpa_common.c

src/common/wpa_common.h

src/common/wpa_ctrl.h

src/crypto/Makefile

src/crypto/aes.h

src/crypto/crypto.h

src/crypto/crypto_cryptoapi.c

src/crypto/crypto_gnutls.c

src/crypto/crypto_internal.c

src/crypto/crypto_libtomcrypt.c

src/crypto/crypto_none.c

src/crypto/crypto_openssl.c

src/crypto/dh_groups.c

src/crypto/md5.c

src/crypto/md5.h

src/crypto/ms_funcs.c

src/crypto/ms_funcs.h

src/crypto/rc4.c

src/crypto/sha1.c

src/crypto/sha1.h

src/crypto/sha256.c

src/crypto/tls.h

src/crypto/tls_gnutls.c

src/crypto/tls_internal.c

src/crypto/tls_none.c

src/crypto/tls_openssl.c

src/crypto/tls_schannel.c

src/drivers/Makefile

src/drivers/driver.h

src/drivers/driver_atmel.c

src/drivers/driver_broadcom.c

src/drivers/driver_bsd.c

src/drivers/driver_hostap.c

src/drivers/driver_hostap.h

src/drivers/driver_iphone.m

src/drivers/driver_ipw.c

src/drivers/driver_madwifi.c

src/drivers/driver_ndis.c

src/drivers/driver_ndis.h

src/drivers/driver_ndiswrapper.c

src/drivers/driver_nl80211.c

src/drivers/driver_osx.m

src/drivers/driver_privsep.c

src/drivers/driver_ralink.c

src/drivers/driver_ralink.h

src/drivers/driver_roboswitch.c

src/drivers/driver_test.c

src/drivers/driver_wext.c

src/drivers/driver_wext.h

src/drivers/driver_wired.c

src/drivers/drivers.c

src/drivers/priv_netlink.h

src/eap_common/Makefile

src/eap_common/chap.c

src/eap_common/chap.h

src/eap_common/eap_fast_common.c

src/eap_common/eap_gpsk_common.c

src/eap_common/eap_pax_common.c

src/eap_common/eap_peap_common.c

src/eap_common/eap_psk_common.c

src/eap_common/eap_sake_common.c

src/eap_common/eap_sim_common.c

src/eap_common/eap_sim_common.h

src/eap_common/ikev2_common.c

src/eap_peer/Makefile

src/eap_peer/eap.c

src/eap_peer/eap.h

src/eap_peer/eap_aka.c

src/eap_peer/eap_config.h

src/eap_peer/eap_fast.c

src/eap_peer/eap_fast_pac.c

src/eap_peer/eap_leap.c

src/eap_peer/eap_md5.c

src/eap_peer/eap_methods.c

src/eap_peer/eap_methods.h

src/eap_peer/eap_mschapv2.c

src/eap_peer/eap_pax.c

src/eap_peer/eap_peap.c

src/eap_peer/eap_psk.c

src/eap_peer/eap_sim.c

src/eap_peer/eap_tls.c

src/eap_peer/eap_tls_common.c

src/eap_peer/eap_tls_common.h

src/eap_peer/eap_tnc.c

src/eap_peer/eap_ttls.c

src/eap_peer/eap_wsc.c

src/eap_peer/ikev2.c

src/eap_peer/mschapv2.c

src/eap_peer/mschapv2.h

src/eap_server/Makefile

src/eap_server/eap.h

src/eap_server/eap_i.h

src/eap_server/eap_methods.h

src/eap_server/eap_sim_db.c

src/eap_server/eap_sim_db.h

src/eap_server/eap_tls_common.h

src/eap_server/ikev2.c

src/eap_server/tncs.c

src/eapol_supp/Makefile

src/eapol_supp/eapol_supp_sm.c

src/eapol_supp/eapol_supp_sm.h

src/l2_packet/Makefile

src/l2_packet/l2_packet_ndis.c

src/l2_packet/l2_packet_privsep.c

src/radius/Makefile

src/radius/radius.c

src/radius/radius.h

src/radius/radius_client.c

src/radius/radius_client.h

src/radius/radius_server.c

src/radius/radius_server.h

src/rsn_supp/Makefile

src/rsn_supp/peerkey.c

src/rsn_supp/pmksa_cache.c

src/rsn_supp/pmksa_cache.h

src/rsn_supp/preauth.c

src/rsn_supp/preauth.h

src/rsn_supp/wpa.c

src/rsn_supp/wpa.h

src/rsn_supp/wpa_ft.c

src/rsn_supp/wpa_i.h

src/rsn_supp/wpa_ie.c

src/rsn_supp/wpa_ie.h

src/tls/Makefile

src/tls/asn1.c

src/tls/asn1.h

src/tls/rsa.c

src/tls/tlsv1_client.c

src/tls/tlsv1_client_read.c

src/tls/tlsv1_client_write.c

src/tls/tlsv1_common.h

src/tls/tlsv1_cred.c

src/tls/tlsv1_record.c

src/tls/tlsv1_record.h

src/tls/tlsv1_server.c

src/tls/tlsv1_server_read.c

src/tls/tlsv1_server_write.c

src/tls/x509v3.c

src/tls/x509v3.h

src/utils/Makefile

src/utils/base64.c

src/utils/build_config.h

src/utils/common.c

src/utils/common.h

src/utils/eloop.c

src/utils/eloop.h

src/utils/eloop_none.c

src/utils/eloop_win.c

src/utils/ip_addr.h

src/utils/os.h

src/utils/os_internal.c

src/utils/os_unix.c

src/utils/uuid.c

src/utils/uuid.h

src/utils/wpa_debug.c

src/utils/wpabuf.c

src/utils/wpabuf.h

src/wps/Makefile

src/wps/httpread.c

src/wps/httpread.h

src/wps/wps.c

src/wps/wps.h

src/wps/wps_attr_build.c

src/wps/wps_attr_parse.c

src/wps/wps_attr_process.c

src/wps/wps_common.c

src/wps/wps_defs.h

src/wps/wps_dev_attr.c

src/wps/wps_enrollee.c

src/wps/wps_i.h

src/wps/wps_registrar.c

src/wps/wps_upnp.c

src/wps/wps_upnp.h

src/wps/wps_upnp_event.c

src/wps/wps_upnp_i.h

src/wps/wps_upnp_ssdp.c

src/wps/wps_upnp_web.c

wpa_supplicant/ChangeLog

wpa_supplicant/Makefile

wpa_supplicant/README

wpa_supplicant/README-WPS

wpa_supplicant/config.c

wpa_supplicant/config.h

wpa_supplicant/config_file.c

wpa_supplicant/config_ssid.h

wpa_supplicant/config_winreg.c

wpa_supplicant/ctrl_iface.c

wpa_supplicant/ctrl_iface_named_pipe.c

wpa_supplicant/ctrl_iface_udp.c

wpa_supplicant/ctrl_iface_unix.c

wpa_supplicant/defconfig

wpa_supplicant/doc/docbook/wpa_background.8

wpa_supplicant/doc/docbook/wpa_cli.8

wpa_supplicant/doc/docbook/wpa_gui.8

wpa_supplicant/doc/docbook/wpa_passphrase.8

wpa_supplicant/doc/docbook/wpa_priv.8

wpa_supplicant/doc/docbook/wpa_supplicant.8

wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

wpa_supplicant/doc/docbook/wpa_supplicant.sgml

wpa_supplicant/eapol_test.c

wpa_supplicant/events.c

wpa_supplicant/main.c

wpa_supplicant/mlme.c

wpa_supplicant/mlme.h

wpa_supplicant/nmake.mak

wpa_supplicant/preauth_test.c

wpa_supplicant/scan.c

wpa_supplicant/symbian/wpa_supplicant.mmp

wpa_supplicant/tests/test_eap_sim_common.c

wpa_supplicant/tests/test_wpa.c

wpa_supplicant/todo.txt

wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj

wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj

wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj

wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj

wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj

wpa_supplicant/wpa_cli.c

wpa_supplicant/wpa_gui-qt4/addinterface.cpp

wpa_supplicant/wpa_gui-qt4/eventhistory.cpp

wpa_supplicant/wpa_gui-qt4/icons.qrc

wpa_supplicant/wpa_gui-qt4/icons/Makefile

wpa_supplicant/wpa_gui-qt4/icons/README

wpa_supplicant/wpa_gui-qt4/icons_png.qrc

wpa_supplicant/wpa_gui-qt4/main.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.ui

wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp

wpa_supplicant/wpa_gui-qt4/wpa_gui.pro

wpa_supplicant/wpa_gui-qt4/wpagui.cpp

wpa_supplicant/wpa_gui-qt4/wpagui.h

wpa_supplicant/wpa_gui-qt4/wpagui.ui

wpa_supplicant/wpa_gui/scanresults.ui

wpa_supplicant/wpa_gui/userdatarequest.ui

wpa_supplicant/wpa_gui/wpa_gui.pro

wpa_supplicant/wpa_gui/wpagui.ui

wpa_supplicant/wpa_passphrase.c

wpa_supplicant/wpa_priv.c

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.conf

wpa_supplicant/wpa_supplicant.nsi

wpa_supplicant/wpa_supplicant_i.h

wpa_supplicant/wpas_glue.c

wpa_supplicant/wps_supplicant.c

wpa_supplicant/wps_supplicant.h

Show diffs side-by-side

added added

removed removed

src/eap_server/eap_psk.c

* hostapd / EAP-PSK (RFC 4764) server

* 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.

* Note: EAP-PSK is an EAP authentication method and as such, completely

* different from WPA-PSK. This file is not needed for WPA-PSK functionality.

#include "includes.h"

#include "common.h"

#include "eap_server/eap_i.h"

#include "aes_wrap.h"

#include "eap_common/eap_psk_common.h"

struct eap_psk_data {

enum { PSK_1, PSK_3, SUCCESS, FAILURE } state;

u8 rand_s[EAP_PSK_RAND_LEN];

u8 rand_p[EAP_PSK_RAND_LEN];

u8 *id_p, *id_s;

size_t id_p_len, id_s_len;

u8 ak[EAP_PSK_AK_LEN], kdk[EAP_PSK_KDK_LEN], tek[EAP_PSK_TEK_LEN];

u8 msk[EAP_MSK_LEN];

u8 emsk[EAP_EMSK_LEN];

};

static void * eap_psk_init(struct eap_sm *sm)

{

struct eap_psk_data *data;

data = os_zalloc(sizeof(*data));

if (data == NULL)

return NULL;

data->state = PSK_1;

data->id_s = (u8 *) "hostapd";

data->id_s_len = 7;

return data;

}

static void eap_psk_reset(struct eap_sm *sm, void *priv)

{

struct eap_psk_data *data = priv;

os_free(data->id_p);

os_free(data);

}

static struct wpabuf * eap_psk_build_1(struct eap_sm *sm,

struct eap_psk_data *data, u8 id)

{

struct wpabuf *req;

struct eap_psk_hdr_1 *psk;

wpa_printf(MSG_DEBUG, "EAP-PSK: PSK-1 (sending)");

if (os_get_random(data->rand_s, EAP_PSK_RAND_LEN)) {

wpa_printf(MSG_ERROR, "EAP-PSK: Failed to get random data");

data->state = FAILURE;

return NULL;

}

wpa_hexdump(MSG_MSGDUMP, "EAP-PSK: RAND_S (server rand)",

data->rand_s, EAP_PSK_RAND_LEN);

req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PSK,

sizeof(*psk) + data->id_s_len,

EAP_CODE_REQUEST, id);

if (req == NULL) {

wpa_printf(MSG_ERROR, "EAP-PSK: Failed to allocate memory "

"request");

data->state = FAILURE;

return NULL;

}

psk = wpabuf_put(req, sizeof(*psk));

psk->flags = EAP_PSK_FLAGS_SET_T(0); /* T=0 */

os_memcpy(psk->rand_s, data->rand_s, EAP_PSK_RAND_LEN);

wpabuf_put_data(req, data->id_s, data->id_s_len);

return req;

}

static struct wpabuf * eap_psk_build_3(struct eap_sm *sm,

struct eap_psk_data *data, u8 id)

{

struct wpabuf *req;

100

struct eap_psk_hdr_3 *psk;

101

u8 *buf, *pchannel, nonce[16];

102

size_t buflen;

103

104

wpa_printf(MSG_DEBUG, "EAP-PSK: PSK-3 (sending)");

105

106

req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PSK,

107

sizeof(*psk) + 4 + 16 + 1, EAP_CODE_REQUEST, id);

108

if (req == NULL) {

109

wpa_printf(MSG_ERROR, "EAP-PSK: Failed to allocate memory "

110

"request");

111

data->state = FAILURE;

112

return NULL;

113

}

114

115

psk = wpabuf_put(req, sizeof(*psk));

116

psk->flags = EAP_PSK_FLAGS_SET_T(2); /* T=2 */

117

os_memcpy(psk->rand_s, data->rand_s, EAP_PSK_RAND_LEN);

118

119

/* MAC_S = OMAC1-AES-128(AK, ID_S||RAND_P) */

120

buflen = data->id_s_len + EAP_PSK_RAND_LEN;

121

buf = os_malloc(buflen);

122

if (buf == NULL)

123

goto fail;

124

125

os_memcpy(buf, data->id_s, data->id_s_len);

126

os_memcpy(buf + data->id_s_len, data->rand_p, EAP_PSK_RAND_LEN);

127

if (omac1_aes_128(data->ak, buf, buflen, psk->mac_s))

128

goto fail;

129

os_free(buf);

130

131

if (eap_psk_derive_keys(data->kdk, data->rand_p, data->tek, data->msk,

132

data->emsk))

133

goto fail;

134

wpa_hexdump_key(MSG_DEBUG, "EAP-PSK: TEK", data->tek, EAP_PSK_TEK_LEN);

135

wpa_hexdump_key(MSG_DEBUG, "EAP-PSK: MSK", data->msk, EAP_MSK_LEN);

136

wpa_hexdump_key(MSG_DEBUG, "EAP-PSK: EMSK", data->emsk, EAP_EMSK_LEN);

137

138

os_memset(nonce, 0, sizeof(nonce));

139

pchannel = wpabuf_put(req, 4 + 16 + 1);

140

os_memcpy(pchannel, nonce + 12, 4);

141

os_memset(pchannel + 4, 0, 16); /* Tag */

142

pchannel[4 + 16] = EAP_PSK_R_FLAG_DONE_SUCCESS << 6;

143

wpa_hexdump(MSG_DEBUG, "EAP-PSK: PCHANNEL (plaintext)",

144

pchannel, 4 + 16 + 1);

145

if (aes_128_eax_encrypt(data->tek, nonce, sizeof(nonce),

146

wpabuf_head(req), 22,

147

pchannel + 4 + 16, 1, pchannel + 4))

148

goto fail;

149

wpa_hexdump(MSG_DEBUG, "EAP-PSK: PCHANNEL (encrypted)",

150

pchannel, 4 + 16 + 1);

151

152

return req;

153

154

fail:

155

wpabuf_free(req);

156

data->state = FAILURE;

157

return NULL;

158

}

159

160

161

static struct wpabuf * eap_psk_buildReq(struct eap_sm *sm, void *priv, u8 id)

162

{

163

struct eap_psk_data *data = priv;

164

165

switch (data->state) {

166

case PSK_1:

167

return eap_psk_build_1(sm, data, id);

168

case PSK_3:

169

return eap_psk_build_3(sm, data, id);

170

default:

171

wpa_printf(MSG_DEBUG, "EAP-PSK: Unknown state %d in buildReq",

172

data->state);

173

break;

174

}

175

return NULL;

176

}

177

178

179

static Boolean eap_psk_check(struct eap_sm *sm, void *priv,

180

struct wpabuf *respData)

181

{

182

struct eap_psk_data *data = priv;

183

size_t len;

184

u8 t;

185

const u8 *pos;

186

187

pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_PSK, respData, &len);

188

if (pos == NULL || len < 1) {

189

wpa_printf(MSG_INFO, "EAP-PSK: Invalid frame");

190

return TRUE;

191

}

192

t = EAP_PSK_FLAGS_GET_T(*pos);

193

194

wpa_printf(MSG_DEBUG, "EAP-PSK: received frame: T=%d", t);

195

196

if (data->state == PSK_1 && t != 1) {

197

wpa_printf(MSG_DEBUG, "EAP-PSK: Expected PSK-2 - "

198

"ignore T=%d", t);

199

return TRUE;

200

}

201

202

if (data->state == PSK_3 && t != 3) {

203

wpa_printf(MSG_DEBUG, "EAP-PSK: Expected PSK-4 - "

204

"ignore T=%d", t);

205

return TRUE;

206

}

207

208

if ((t == 1 && len < sizeof(struct eap_psk_hdr_2)) ||

209

(t == 3 && len < sizeof(struct eap_psk_hdr_4))) {

210

wpa_printf(MSG_DEBUG, "EAP-PSK: Too short frame");

211

return TRUE;

212

}

213

214

return FALSE;

215

}

216

217

218

static void eap_psk_process_2(struct eap_sm *sm,

219

struct eap_psk_data *data,

220

struct wpabuf *respData)

221

{

222

const struct eap_psk_hdr_2 *resp;

223

u8 *pos, mac[EAP_PSK_MAC_LEN], *buf;

224

size_t left, buflen;

225

int i;

226

const u8 *cpos;

227

228

if (data->state != PSK_1)

229

return;

230

231

wpa_printf(MSG_DEBUG, "EAP-PSK: Received PSK-2");

232

233

cpos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_PSK, respData,

234

&left);

235

if (cpos == NULL || left < sizeof(*resp)) {

236

wpa_printf(MSG_INFO, "EAP-PSK: Invalid frame");

237

return;

238

}

239

resp = (const struct eap_psk_hdr_2 *) cpos;

240

cpos = (const u8 *) (resp + 1);

241

left -= sizeof(*resp);

242

243

os_free(data->id_p);

244

data->id_p = os_malloc(left);

245

if (data->id_p == NULL) {

246

wpa_printf(MSG_INFO, "EAP-PSK: Failed to allocate memory for "

247

"ID_P");

248

return;

249

}

250

os_memcpy(data->id_p, cpos, left);

251

data->id_p_len = left;

252

wpa_hexdump_ascii(MSG_MSGDUMP, "EAP-PSK: ID_P",

253

data->id_p, data->id_p_len);

254

255

if (eap_user_get(sm, data->id_p, data->id_p_len, 0) < 0) {

256

wpa_hexdump_ascii(MSG_DEBUG, "EAP-PSK: unknown ID_P",

257

data->id_p, data->id_p_len);

258

data->state = FAILURE;

259

return;

260

}

261

262

for (i = 0;

263

i < EAP_MAX_METHODS &&

264

(sm->user->methods[i].vendor != EAP_VENDOR_IETF ||

265

sm->user->methods[i].method != EAP_TYPE_NONE);

266

i++) {

267

if (sm->user->methods[i].vendor == EAP_VENDOR_IETF &&

268

sm->user->methods[i].method == EAP_TYPE_PSK)

269

break;

270

}

271

272

if (i >= EAP_MAX_METHODS ||

273

sm->user->methods[i].vendor != EAP_VENDOR_IETF ||

274

sm->user->methods[i].method != EAP_TYPE_PSK) {

275

wpa_hexdump_ascii(MSG_DEBUG,

276

"EAP-PSK: EAP-PSK not enabled for ID_P",

277

data->id_p, data->id_p_len);

278

data->state = FAILURE;

279

return;

280

}

281

282

if (sm->user->password == NULL ||

283

sm->user->password_len != EAP_PSK_PSK_LEN) {

284

wpa_hexdump_ascii(MSG_DEBUG, "EAP-PSK: invalid password in "

285

"user database for ID_P",

286

data->id_p, data->id_p_len);

287

data->state = FAILURE;

288

return;

289

}

290

if (eap_psk_key_setup(sm->user->password, data->ak, data->kdk)) {

291

data->state = FAILURE;

292

return;

293

}

294

wpa_hexdump_key(MSG_DEBUG, "EAP-PSK: AK", data->ak, EAP_PSK_AK_LEN);

295

wpa_hexdump_key(MSG_DEBUG, "EAP-PSK: KDK", data->kdk, EAP_PSK_KDK_LEN);

296

297

wpa_hexdump(MSG_MSGDUMP, "EAP-PSK: RAND_P (client rand)",

298

resp->rand_p, EAP_PSK_RAND_LEN);

299

os_memcpy(data->rand_p, resp->rand_p, EAP_PSK_RAND_LEN);

300

301

/* MAC_P = OMAC1-AES-128(AK, ID_P||ID_S||RAND_S||RAND_P) */

302

buflen = data->id_p_len + data->id_s_len + 2 * EAP_PSK_RAND_LEN;

303

buf = os_malloc(buflen);

304

if (buf == NULL) {

305

data->state = FAILURE;

306

return;

307

}

308

os_memcpy(buf, data->id_p, data->id_p_len);

309

pos = buf + data->id_p_len;

310

os_memcpy(pos, data->id_s, data->id_s_len);

311

pos += data->id_s_len;

312

os_memcpy(pos, data->rand_s, EAP_PSK_RAND_LEN);

313

pos += EAP_PSK_RAND_LEN;

314

os_memcpy(pos, data->rand_p, EAP_PSK_RAND_LEN);

315

if (omac1_aes_128(data->ak, buf, buflen, mac)) {

316

os_free(buf);

317

data->state = FAILURE;

318

return;

319

}

320

os_free(buf);

321

wpa_hexdump(MSG_DEBUG, "EAP-PSK: MAC_P", resp->mac_p, EAP_PSK_MAC_LEN);

322

if (os_memcmp(mac, resp->mac_p, EAP_PSK_MAC_LEN) != 0) {

323

wpa_printf(MSG_INFO, "EAP-PSK: Invalid MAC_P");

324

wpa_hexdump(MSG_MSGDUMP, "EAP-PSK: Expected MAC_P",

325

mac, EAP_PSK_MAC_LEN);

326

data->state = FAILURE;

327

return;

328

}

329

330

data->state = PSK_3;

331

}

332

333

334

static void eap_psk_process_4(struct eap_sm *sm,

335

struct eap_psk_data *data,

336

struct wpabuf *respData)

337

{

338

const struct eap_psk_hdr_4 *resp;

339

u8 *decrypted, nonce[16];

340

size_t left;

341

const u8 *pos, *tag;

342

343

if (data->state != PSK_3)

344

return;

345

346

wpa_printf(MSG_DEBUG, "EAP-PSK: Received PSK-4");

347

348

pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_PSK, respData, &left);

349

if (pos == NULL || left < sizeof(*resp)) {

350

wpa_printf(MSG_INFO, "EAP-PSK: Invalid frame");

351

return;

352

}

353

resp = (const struct eap_psk_hdr_4 *) pos;

354

pos = (const u8 *) (resp + 1);

355

left -= sizeof(*resp);

356

357

wpa_hexdump(MSG_MSGDUMP, "EAP-PSK: Encrypted PCHANNEL", pos, left);

358

359

if (left < 4 + 16 + 1) {

360

wpa_printf(MSG_INFO, "EAP-PSK: Too short PCHANNEL data in "

361

"PSK-4 (len=%lu, expected 21)",

362

(unsigned long) left);

363

return;

364

}

365

366

if (pos[0] == 0 && pos[1] == 0 && pos[2] == 0 && pos[3] == 0) {

367

wpa_printf(MSG_DEBUG, "EAP-PSK: Nonce did not increase");

368

return;

369

}

370

371

os_memset(nonce, 0, 12);

372

os_memcpy(nonce + 12, pos, 4);

373

pos += 4;

374

left -= 4;

375

tag = pos;

376

pos += 16;

377

left -= 16;

378

379

decrypted = os_malloc(left);

380

if (decrypted == NULL)

381

return;

382

os_memcpy(decrypted, pos, left);

383

384

if (aes_128_eax_decrypt(data->tek, nonce, sizeof(nonce),

385

wpabuf_head(respData), 22, decrypted, left,

386

tag)) {

387

wpa_printf(MSG_WARNING, "EAP-PSK: PCHANNEL decryption failed");

388

os_free(decrypted);

389

data->state = FAILURE;

390

return;

391

}

392

wpa_hexdump(MSG_DEBUG, "EAP-PSK: Decrypted PCHANNEL message",

393

decrypted, left);

394

395

/* Verify R flag */

396

switch (decrypted[0] >> 6) {

397

case EAP_PSK_R_FLAG_CONT:

398

wpa_printf(MSG_DEBUG, "EAP-PSK: R flag - CONT - unsupported");

399

data->state = FAILURE;

400

break;

401

case EAP_PSK_R_FLAG_DONE_SUCCESS:

402

wpa_printf(MSG_DEBUG, "EAP-PSK: R flag - DONE_SUCCESS");

403

data->state = SUCCESS;

404

break;

405

case EAP_PSK_R_FLAG_DONE_FAILURE:

406

wpa_printf(MSG_DEBUG, "EAP-PSK: R flag - DONE_FAILURE");

407

data->state = FAILURE;

408

break;

409

}

410

os_free(decrypted);

411

}

412

413

414

static void eap_psk_process(struct eap_sm *sm, void *priv,

415

struct wpabuf *respData)

416

{

417

struct eap_psk_data *data = priv;

418

const u8 *pos;

419

size_t len;

420

421

if (sm->user == NULL || sm->user->password == NULL) {

422

wpa_printf(MSG_INFO, "EAP-PSK: Plaintext password not "

423

"configured");

424

data->state = FAILURE;

425

return;

426

}

427

428

pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_PSK, respData, &len);

429

if (pos == NULL || len < 1)

430

return;

431

432

switch (EAP_PSK_FLAGS_GET_T(*pos)) {

433

case 1:

434

eap_psk_process_2(sm, data, respData);

435

break;

436

case 3:

437

eap_psk_process_4(sm, data, respData);

438

break;

439

}

440

}

441

442

443

static Boolean eap_psk_isDone(struct eap_sm *sm, void *priv)

444

{

445

struct eap_psk_data *data = priv;

446

return data->state == SUCCESS || data->state == FAILURE;

447

}

448

449

450

static u8 * eap_psk_getKey(struct eap_sm *sm, void *priv, size_t *len)

451

{

452

struct eap_psk_data *data = priv;

453

u8 *key;

454

455

if (data->state != SUCCESS)

456

return NULL;

457

458

key = os_malloc(EAP_MSK_LEN);

459

if (key == NULL)

460

return NULL;

461

os_memcpy(key, data->msk, EAP_MSK_LEN);

462

*len = EAP_MSK_LEN;

463

464

return key;

465

}

466

467

468

static u8 * eap_psk_get_emsk(struct eap_sm *sm, void *priv, size_t *len)

469

{

470

struct eap_psk_data *data = priv;

471

u8 *key;

472

473

if (data->state != SUCCESS)

474

return NULL;

475

476

key = os_malloc(EAP_EMSK_LEN);

477

if (key == NULL)

478

return NULL;

479

os_memcpy(key, data->emsk, EAP_EMSK_LEN);

480

*len = EAP_EMSK_LEN;

481

482

return key;

483

}

484

485

486

static Boolean eap_psk_isSuccess(struct eap_sm *sm, void *priv)

487

{

488

struct eap_psk_data *data = priv;

489

return data->state == SUCCESS;

490

}

491

492

493

int eap_server_psk_register(void)

494

{

495

struct eap_method *eap;

496

int ret;

497

498

eap = eap_server_method_alloc(EAP_SERVER_METHOD_INTERFACE_VERSION,

499

EAP_VENDOR_IETF, EAP_TYPE_PSK, "PSK");

500

if (eap == NULL)

501

return -1;

502

503

eap->init = eap_psk_init;

504

eap->reset = eap_psk_reset;

505

eap->buildReq = eap_psk_buildReq;

506

eap->check = eap_psk_check;

507

eap->process = eap_psk_process;

508

eap->isDone = eap_psk_isDone;

509

eap->getKey = eap_psk_getKey;

510

eap->isSuccess = eap_psk_isSuccess;

511

eap->get_emsk = eap_psk_get_emsk;

512

513

ret = eap_server_method_register(eap);

514

if (ret)

515

eap_server_method_free(eap);

516

return ret;

517

}

Older »