~ubuntu-branches/ubuntu/hardy/wpasupplicant/hardy

Viewing changes to src/eap_common/eap_sim_common.c

Committer: Bazaar Package Importer
Author(s): Reinhard Tartler, Alexander Sack
Date: 2007-08-26 16:06:57 UTC
mfrom: (1.1.9 upstream)
Revision ID: james.westby@ubuntu.com-20070826160657-2m8pxoweuxe8f93t

Tags: 0.6.0+0.5.8-0ubuntu1

* New upstream release
* remove patch 11_erroneous_manpage_ref, applied upstream
* remove patch 25_wpas_dbus_unregister_iface_fix, applied upstream

[ Alexander Sack ]
* bumping upstream version to replace development version 0.6.0 with
  this package from stable release branch.
* attempt to fix wierd timeout and high latency issues by going
  back to stable upstream version (0.5.9) (LP: #140763,
  LP: #141233).

files added:
ChangeLog

Makefile

README-Windows.txt

aes.c

aes.h

aes_wrap.c

aes_wrap.h

asn1.c

asn1.h

asn1_test.c

base64.c

base64.h

bignum.c

bignum.h

build_config.h

common.c

common.h

config.c

config.h

config_file.c

config_none.c

config_ssid.h

config_types.h

config_winreg.c

crypto.c

crypto.h

crypto_cryptoapi.c

crypto_gnutls.c

crypto_internal.c

crypto_libtomcrypt.c

crypto_none.c

ctrl_iface.c

ctrl_iface.h

ctrl_iface_dbus.c

ctrl_iface_dbus.h

ctrl_iface_dbus_handlers.c

ctrl_iface_dbus_handlers.h

ctrl_iface_named_pipe.c

ctrl_iface_udp.c

ctrl_iface_unix.c

dbus-wpa_supplicant.conf

dbus_dict_helpers.c

dbus_dict_helpers.h

debian/functions.sh

debian/ifupdown.sh

debian/patches/01_config.dpatch

debian/patches/02_debian_doc_examples.dpatch

debian/patches/10_orinoco_wep_key_fix.dpatch

debian/patches/20_include_madwifi.dpatch

debian/patches/21_madwifi_r1794_includes.dpatch

debian/patches/21_madwifiold_20060207_includes.dpatch

debian/wpa_action.8

debian/wpa_action.sh

debian/wpa_supplicant.init-daemon

debian/wpasupplicant.preinst

defconfig

defs.h

des.c

doc/code_structure.doxygen

doc/ctrl_iface.doxygen

doc/docbook

doc/docbook/Makefile

doc/docbook/wpa_background.8

doc/docbook/wpa_background.sgml

doc/docbook/wpa_cli.8

doc/docbook/wpa_cli.sgml

doc/docbook/wpa_passphrase.8

doc/docbook/wpa_passphrase.sgml

doc/docbook/wpa_supplicant.8

doc/docbook/wpa_supplicant.conf.5

doc/docbook/wpa_supplicant.conf.sgml

doc/docbook/wpa_supplicant.sgml

doc/doxygen.fast

doc/doxygen.full

doc/driver_wrapper.doxygen

doc/eap.doxygen

doc/kerneldoc2doxygen.pl

doc/mainpage.doxygen

doc/porting.doxygen

doc/testing_tools.doxygen

doc/wpa_supplicant.fig

driver.h

driver_atmel.c

driver_broadcom.c

driver_bsd.c

driver_hostap.c

driver_hostap.h

driver_ipw.c

driver_madwifi.c

driver_ndis.c

driver_ndis.h

driver_ndis_.c

driver_ndiswrapper.c

driver_prism54.c

driver_test.c

driver_wext.c

driver_wext.h

driver_wired.c

drivers.c

eap.c

eap.h

eap_aka.c

eap_defs.h

eap_fast.c

eap_gpsk.c

eap_gpsk_common.c

eap_gpsk_common.h

eap_gtc.c

eap_i.h

eap_leap.c

eap_md5.c

eap_methods.c

eap_methods.h

eap_mschapv2.c

eap_otp.c

eap_pax.c

eap_pax_common.c

eap_pax_common.h

eap_peap.c

eap_psk.c

eap_psk_common.c

eap_psk_common.h

eap_sake.c

eap_sake_common.c

eap_sake_common.h

eap_sim.c

eap_sim_common.c

eap_sim_common.h

eap_testing.txt

eap_tls.c

eap_tls_common.c

eap_tls_common.h

eap_tlv.c

eap_tlv.h

eap_ttls.c

eap_ttls.h

eap_vendor_test.c

eapol_sm.c

eapol_sm.h

eapol_test.c

eloop.c

eloop.h

eloop_none.c

eloop_win.c

events.c

examples

examples/ieee8021x.conf

examples/plaintext.conf

examples/wep.conf

examples/wpa-psk-tkip.conf

examples/wpa2-eap-ccmp.conf

hostapd.h

includes.h

l2_packet.h

l2_packet_freebsd.c

l2_packet_linux.c

l2_packet_ndis.c

l2_packet_none.c

l2_packet_pcap.c

l2_packet_winpcap.c

libtommath.c

main.c

main_none.c

main_winmain.c

main_winsvc.c

md4.c

md5.c

md5.h

mlme.c

mlme.h

ms_funcs.c

ms_funcs.h

ndis_events.c

nmake.mak

openssl-0.9.8d-tls-extensions.patch

openssl-0.9.8e-tls-extensions.patch

openssl-tls-extensions.patch

os.h

os_internal.c

os_none.c

os_unix.c

os_win32.c

pcsc_funcs.c

pcsc_funcs.h

pmksa_cache.c

pmksa_cache.h

preauth.c

preauth.h

preauth_test.c

priv_netlink.h

radius.c

radius.h

radius_client.c

radius_client.h

rc4.c

rc4.h

rsa.c

rsa.h

sha1.c

sha1.h

sha256.c

sha256.h

state_machine.h

tests

tests/test_aes.c

tests/test_eap_sim_common.c

tests/test_md4.c

tests/test_md5.c

tests/test_ms_funcs.c

tests/test_sha1.c

tests/test_sha256.c

tests/test_x509v3.c

tls.h

tls_gnutls.c

tls_internal.c

tls_none.c

tls_openssl.c

tls_schannel.c

tlsv1_client.c

tlsv1_client.h

tlsv1_common.c

tlsv1_common.h

todo.txt

version.h

vs2005

vs2005/eapol_test

vs2005/eapol_test/eapol_test.vcproj

vs2005/win_if_list

vs2005/win_if_list/win_if_list.vcproj

vs2005/wpa_cli

vs2005/wpa_cli/wpa_cli.vcproj

vs2005/wpa_passphrase

vs2005/wpa_passphrase/wpa_passphrase.vcproj

vs2005/wpa_supplicant

vs2005/wpa_supplicant.sln

vs2005/wpa_supplicant/wpa_supplicant.vcproj

vs2005/wpasvc

vs2005/wpasvc/wpasvc.vcproj

win_example.reg

win_if_list.c

wireless_copy.h

wpa.c

wpa.h

wpa_cli.c

wpa_common.h

wpa_ctrl.c

wpa_ctrl.h

wpa_gui

wpa_gui-qt4

wpa_gui-qt4/eventhistory.cpp

wpa_gui-qt4/eventhistory.h

wpa_gui-qt4/eventhistory.ui

wpa_gui-qt4/main.cpp

wpa_gui-qt4/networkconfig.cpp

wpa_gui-qt4/networkconfig.h

wpa_gui-qt4/networkconfig.ui

wpa_gui-qt4/scanresults.cpp

wpa_gui-qt4/scanresults.h

wpa_gui-qt4/scanresults.ui

wpa_gui-qt4/setup-mingw-cross-compiling

wpa_gui-qt4/userdatarequest.cpp

wpa_gui-qt4/userdatarequest.h

wpa_gui-qt4/userdatarequest.ui

wpa_gui-qt4/wpa_gui.pro

wpa_gui-qt4/wpagui.cpp

wpa_gui-qt4/wpagui.h

wpa_gui-qt4/wpagui.ui

wpa_gui-qt4/wpamsg.h

wpa_gui/eventhistory.ui

wpa_gui/eventhistory.ui.h

wpa_gui/main.cpp

wpa_gui/networkconfig.ui

wpa_gui/networkconfig.ui.h

wpa_gui/scanresults.ui

wpa_gui/scanresults.ui.h

wpa_gui/setup-mingw-cross-compiling

wpa_gui/userdatarequest.ui

wpa_gui/userdatarequest.ui.h

wpa_gui/wpa_gui.pro

wpa_gui/wpagui.ui

wpa_gui/wpagui.ui.h

wpa_gui/wpamsg.h

wpa_i.h

wpa_passphrase.c

wpa_supplicant.c

wpa_supplicant.conf

wpa_supplicant.h

wpa_supplicant_i.h

x509v3.c

x509v3.h

files removed:
debian/dbus-wpa_supplicant.service

debian/dot.config.mk

debian/ifupdown

debian/ifupdown/functions.sh

debian/ifupdown/ifupdown.sh

debian/ifupdown/wpa_action.8

debian/ifupdown/wpa_action.sh

debian/mk-madwifi-header-patch

debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch

debian/patches/20_madwifi_headers

debian/patches/30_dbus_policy.dpatch

debian/patches/40_debian_doc_examples.dpatch

patches

patches/openssl-0.9.8-tls-extensions.patch

patches/openssl-0.9.8d-tls-extensions.patch

patches/openssl-0.9.8e-tls-extensions.patch

src/Makefile

src/common

src/common/Makefile

src/common/defs.h

src/common/ieee802_11_defs.h

src/common/version.h

src/common/wireless_copy.h

src/common/wpa_common.c

src/common/wpa_common.h

src/common/wpa_ctrl.c

src/common/wpa_ctrl.h

src/crypto

src/crypto/Makefile

src/crypto/aes.c

src/crypto/aes.h

src/crypto/aes_wrap.c

src/crypto/aes_wrap.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/des.c

src/crypto/md4.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/rc4.h

src/crypto/sha1.c

src/crypto/sha1.h

src/crypto/sha256.c

src/crypto/sha256.h

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

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_ipw.c

src/drivers/driver_madwifi.c

src/drivers/driver_ndis.c

src/drivers/driver_ndis.h

src/drivers/driver_ndis_.c

src/drivers/driver_ndiswrapper.c

src/drivers/driver_prism54.c

src/drivers/driver_ralink.c

src/drivers/driver_ralink.h

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

src/drivers/priv_netlink.h

src/eap_common

src/eap_common/Makefile

src/eap_common/eap_common.c

src/eap_common/eap_common.h

src/eap_common/eap_defs.h

src/eap_common/eap_gpsk_common.c

src/eap_common/eap_gpsk_common.h

src/eap_common/eap_pax_common.c

src/eap_common/eap_pax_common.h

src/eap_common/eap_psk_common.c

src/eap_common/eap_psk_common.h

src/eap_common/eap_sake_common.c

src/eap_common/eap_sake_common.h

src/eap_common/eap_sim_common.c

src/eap_common/eap_sim_common.h

src/eap_common/eap_ttls.h

src/eap_peer

src/eap_peer/Makefile

src/eap_peer/eap.c

src/eap_peer/eap.h

src/eap_peer/eap_aka.c

src/eap_peer/eap_fast.c

src/eap_peer/eap_fast_pac.c

src/eap_peer/eap_fast_pac.h

src/eap_peer/eap_gpsk.c

src/eap_peer/eap_gtc.c

src/eap_peer/eap_i.h

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_otp.c

src/eap_peer/eap_pax.c

src/eap_peer/eap_peap.c

src/eap_peer/eap_psk.c

src/eap_peer/eap_sake.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_tlv.c

src/eap_peer/eap_tlv.h

src/eap_peer/eap_tnc.c

src/eap_peer/eap_ttls.c

src/eap_peer/eap_vendor_test.c

src/eap_peer/tncc.c

src/eap_peer/tncc.h

src/eap_server

src/eap_server/Makefile

src/eap_server/eap.c

src/eap_server/eap.h

src/eap_server/eap_aka.c

src/eap_server/eap_gpsk.c

src/eap_server/eap_gtc.c

src/eap_server/eap_i.h

src/eap_server/eap_identity.c

src/eap_server/eap_md5.c

src/eap_server/eap_methods.c

src/eap_server/eap_methods.h

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_sim_db.c

src/eap_server/eap_sim_db.h

src/eap_server/eap_tls.c

src/eap_server/eap_tls_common.c

src/eap_server/eap_tls_common.h

src/eap_server/eap_tlv.c

src/eap_server/eap_ttls.c

src/eap_server/eap_vendor_test.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/l2_packet

src/l2_packet/Makefile

src/l2_packet/l2_packet.h

src/l2_packet/l2_packet_freebsd.c

src/l2_packet/l2_packet_linux.c

src/l2_packet/l2_packet_ndis.c

src/l2_packet/l2_packet_none.c

src/l2_packet/l2_packet_pcap.c

src/l2_packet/l2_packet_winpcap.c

src/radius

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

src/rsn_supp/Makefile

src/rsn_supp/peerkey.c

src/rsn_supp/peerkey.h

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

src/tls/Makefile

src/tls/asn1.c

src/tls/asn1.h

src/tls/asn1_test.c

src/tls/bignum.c

src/tls/bignum.h

src/tls/libtommath.c

src/tls/rsa.c

src/tls/rsa.h

src/tls/tlsv1_client.c

src/tls/tlsv1_client.h

src/tls/tlsv1_common.c

src/tls/tlsv1_common.h

src/tls/x509v3.c

src/tls/x509v3.h

src/utils

src/utils/Makefile

src/utils/base64.c

src/utils/base64.h

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/includes.h

src/utils/ip_addr.c

src/utils/ip_addr.h

src/utils/os.h

src/utils/os_internal.c

src/utils/os_none.c

src/utils/os_unix.c

src/utils/os_win32.c

src/utils/pcsc_funcs.c

src/utils/pcsc_funcs.h

src/utils/state_machine.h

src/utils/wpa_debug.c

src/utils/wpa_debug.h

wpa_supplicant

wpa_supplicant/ChangeLog

wpa_supplicant/Makefile

wpa_supplicant/README

wpa_supplicant/README-Windows.txt

wpa_supplicant/config.c

wpa_supplicant/config.h

wpa_supplicant/config_file.c

wpa_supplicant/config_none.c

wpa_supplicant/config_ssid.h

wpa_supplicant/config_winreg.c

wpa_supplicant/ctrl_iface.c

wpa_supplicant/ctrl_iface.h

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

wpa_supplicant/ctrl_iface_udp.c

wpa_supplicant/ctrl_iface_unix.c

wpa_supplicant/dbus-wpa_supplicant.conf

wpa_supplicant/dbus_dict_helpers.c

wpa_supplicant/dbus_dict_helpers.h

wpa_supplicant/defconfig

wpa_supplicant/doc

wpa_supplicant/doc/code_structure.doxygen

wpa_supplicant/doc/ctrl_iface.doxygen

wpa_supplicant/doc/docbook

wpa_supplicant/doc/docbook/Makefile

wpa_supplicant/doc/docbook/wpa_background.8

wpa_supplicant/doc/docbook/wpa_background.sgml

wpa_supplicant/doc/docbook/wpa_cli.8

wpa_supplicant/doc/docbook/wpa_cli.sgml

wpa_supplicant/doc/docbook/wpa_passphrase.8

wpa_supplicant/doc/docbook/wpa_passphrase.sgml

wpa_supplicant/doc/docbook/wpa_supplicant.8

wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml

wpa_supplicant/doc/docbook/wpa_supplicant.sgml

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/eap_testing.txt

wpa_supplicant/eapol_sm.c

wpa_supplicant/eapol_sm.h

wpa_supplicant/eapol_test.c

wpa_supplicant/events.c

wpa_supplicant/examples

wpa_supplicant/examples/ieee8021x.conf

wpa_supplicant/examples/plaintext.conf

wpa_supplicant/examples/wep.conf

wpa_supplicant/examples/wpa-psk-tkip.conf

wpa_supplicant/examples/wpa2-eap-ccmp.conf

wpa_supplicant/examples/wpas-test.py

wpa_supplicant/main.c

wpa_supplicant/main_none.c

wpa_supplicant/main_symbian.cpp

wpa_supplicant/main_winmain.c

wpa_supplicant/main_winsvc.c

wpa_supplicant/mlme.c

wpa_supplicant/mlme.h

wpa_supplicant/nmake.mak

wpa_supplicant/preauth_test.c

wpa_supplicant/symbian

wpa_supplicant/symbian/README.symbian

wpa_supplicant/symbian/bld.inf

wpa_supplicant/symbian/wpa_supplicant.mmp

wpa_supplicant/tests

wpa_supplicant/tests/link_test.c

wpa_supplicant/tests/test_aes.c

wpa_supplicant/tests/test_eap_sim_common.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_wpa.c

wpa_supplicant/tests/test_x509v3.c

wpa_supplicant/todo.txt

wpa_supplicant/vs2005

wpa_supplicant/vs2005/eapol_test

wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj

wpa_supplicant/vs2005/win_if_list

wpa_supplicant/vs2005/win_if_list/win_if_list.vcproj

wpa_supplicant/vs2005/wpa_cli

wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj

wpa_supplicant/vs2005/wpa_passphrase

wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj

wpa_supplicant/vs2005/wpa_supplicant

wpa_supplicant/vs2005/wpa_supplicant.sln

wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj

wpa_supplicant/vs2005/wpasvc

wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj

wpa_supplicant/win_example.reg

wpa_supplicant/win_if_list.c

wpa_supplicant/wpa_cli.c

wpa_supplicant/wpa_gui

wpa_supplicant/wpa_gui-qt4

wpa_supplicant/wpa_gui-qt4/eventhistory.cpp

wpa_supplicant/wpa_gui-qt4/eventhistory.h

wpa_supplicant/wpa_gui-qt4/eventhistory.ui

wpa_supplicant/wpa_gui-qt4/main.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.h

wpa_supplicant/wpa_gui-qt4/networkconfig.ui

wpa_supplicant/wpa_gui-qt4/scanresults.cpp

wpa_supplicant/wpa_gui-qt4/scanresults.h

wpa_supplicant/wpa_gui-qt4/scanresults.ui

wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling

wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp

wpa_supplicant/wpa_gui-qt4/userdatarequest.h

wpa_supplicant/wpa_gui-qt4/userdatarequest.ui

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-qt4/wpamsg.h

wpa_supplicant/wpa_gui/eventhistory.ui

wpa_supplicant/wpa_gui/eventhistory.ui.h

wpa_supplicant/wpa_gui/main.cpp

wpa_supplicant/wpa_gui/networkconfig.ui

wpa_supplicant/wpa_gui/networkconfig.ui.h

wpa_supplicant/wpa_gui/scanresults.ui

wpa_supplicant/wpa_gui/scanresults.ui.h

wpa_supplicant/wpa_gui/setup-mingw-cross-compiling

wpa_supplicant/wpa_gui/userdatarequest.ui

wpa_supplicant/wpa_gui/userdatarequest.ui.h

wpa_supplicant/wpa_gui/wpa_gui.pro

wpa_supplicant/wpa_gui/wpagui.ui

wpa_supplicant/wpa_gui/wpagui.ui.h

wpa_supplicant/wpa_gui/wpamsg.h

wpa_supplicant/wpa_passphrase.c

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.conf

wpa_supplicant/wpa_supplicant_i.h

files modified:
README

debian/NEWS

debian/README.Debian

debian/README.modes

debian/changelog

debian/control

debian/copyright

debian/patches/00list

debian/rules

debian/watch

debian/wpagui.install

debian/wpasupplicant.docs

debian/wpasupplicant.examples

debian/wpasupplicant.install

debian/wpasupplicant.manpages

debian/wpasupplicant.postinst

debian/wpasupplicant.wpa-ifupdown.init

Show diffs side-by-side

added added

removed removed

src/eap_common/eap_sim_common.c

* EAP peer: EAP-SIM/AKA shared routines

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 as

* published by the Free Software Foundation.

* Alternatively, this software may be distributed under the terms of BSD

* license.

* See README and COPYING for more details.

#include "includes.h"

#include "common.h"

#include "eap_common/eap_defs.h"

#include "sha1.h"

#include "crypto.h"

#include "aes_wrap.h"

#include "eap_common/eap_sim_common.h"

static int eap_sim_prf(const u8 *key, u8 *x, size_t xlen)

{

return fips186_2_prf(key, EAP_SIM_MK_LEN, x, xlen);

}

void eap_sim_derive_mk(const u8 *identity, size_t identity_len,

const u8 *nonce_mt, u16 selected_version,

const u8 *ver_list, size_t ver_list_len,

int num_chal, const u8 *kc, u8 *mk)

{

u8 sel_ver[2];

const unsigned char *addr[5];

size_t len[5];

addr[0] = identity;

len[0] = identity_len;

addr[1] = kc;

len[1] = num_chal * EAP_SIM_KC_LEN;

addr[2] = nonce_mt;

len[2] = EAP_SIM_NONCE_MT_LEN;

addr[3] = ver_list;

len[3] = ver_list_len;

addr[4] = sel_ver;

len[4] = 2;

WPA_PUT_BE16(sel_ver, selected_version);

/* MK = SHA1(Identity|n*Kc|NONCE_MT|Version List|Selected Version) */

sha1_vector(5, addr, len, mk);

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: MK", mk, EAP_SIM_MK_LEN);

}

void eap_aka_derive_mk(const u8 *identity, size_t identity_len,

const u8 *ik, const u8 *ck, u8 *mk)

{

const u8 *addr[3];

size_t len[3];

addr[0] = identity;

len[0] = identity_len;

addr[1] = ik;

len[1] = EAP_AKA_IK_LEN;

addr[2] = ck;

len[2] = EAP_AKA_CK_LEN;

/* MK = SHA1(Identity|IK|CK) */

sha1_vector(3, addr, len, mk);

wpa_hexdump_key(MSG_DEBUG, "EAP-AKA: IK", ik, EAP_AKA_IK_LEN);

wpa_hexdump_key(MSG_DEBUG, "EAP-AKA: CK", ck, EAP_AKA_CK_LEN);

wpa_hexdump_key(MSG_DEBUG, "EAP-AKA: MK", mk, EAP_SIM_MK_LEN);

}

int eap_sim_derive_keys(const u8 *mk, u8 *k_encr, u8 *k_aut, u8 *msk, u8 *emsk)

{

u8 buf[EAP_SIM_K_ENCR_LEN + EAP_SIM_K_AUT_LEN +

EAP_SIM_KEYING_DATA_LEN + EAP_EMSK_LEN], *pos;

if (eap_sim_prf(mk, buf, sizeof(buf)) < 0) {

wpa_printf(MSG_ERROR, "EAP-SIM: Failed to derive keys");

return -1;

}

pos = buf;

os_memcpy(k_encr, pos, EAP_SIM_K_ENCR_LEN);

pos += EAP_SIM_K_ENCR_LEN;

os_memcpy(k_aut, pos, EAP_SIM_K_AUT_LEN);

pos += EAP_SIM_K_AUT_LEN;

os_memcpy(msk, pos, EAP_SIM_KEYING_DATA_LEN);

pos += EAP_SIM_KEYING_DATA_LEN;

os_memcpy(emsk, pos, EAP_EMSK_LEN);

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: K_encr",

k_encr, EAP_SIM_K_ENCR_LEN);

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: K_aut",

100

k_aut, EAP_SIM_K_AUT_LEN);

101

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: keying material (MSK)",

102

msk, EAP_SIM_KEYING_DATA_LEN);

103

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: EMSK", emsk, EAP_EMSK_LEN);

104

os_memset(buf, 0, sizeof(buf));

105

106

return 0;

107

}

108

109

110

int eap_sim_derive_keys_reauth(u16 _counter,

111

const u8 *identity, size_t identity_len,

112

const u8 *nonce_s, const u8 *mk, u8 *msk,

113

u8 *emsk)

114

{

115

u8 xkey[SHA1_MAC_LEN];

116

u8 buf[EAP_SIM_KEYING_DATA_LEN + EAP_EMSK_LEN + 32];

117

u8 counter[2];

118

const u8 *addr[4];

119

size_t len[4];

120

121

addr[0] = identity;

122

len[0] = identity_len;

123

addr[1] = counter;

124

len[1] = 2;

125

addr[2] = nonce_s;

126

len[2] = EAP_SIM_NONCE_S_LEN;

127

addr[3] = mk;

128

len[3] = EAP_SIM_MK_LEN;

129

130

WPA_PUT_BE16(counter, _counter);

131

132

wpa_printf(MSG_DEBUG, "EAP-SIM: Deriving keying data from reauth");

133

wpa_hexdump_ascii(MSG_DEBUG, "EAP-SIM: Identity",

134

identity, identity_len);

135

wpa_hexdump(MSG_DEBUG, "EAP-SIM: counter", counter, 2);

136

wpa_hexdump(MSG_DEBUG, "EAP-SIM: NONCE_S", nonce_s,

137

EAP_SIM_NONCE_S_LEN);

138

wpa_hexdump_key(MSG_DEBUG, "EAP-SIM: MK", mk, EAP_SIM_MK_LEN);

139

140

/* XKEY' = SHA1(Identity|counter|NONCE_S|MK) */

141

sha1_vector(4, addr, len, xkey);

142

wpa_hexdump(MSG_DEBUG, "EAP-SIM: XKEY'", xkey, SHA1_MAC_LEN);

143

144

if (eap_sim_prf(xkey, buf, sizeof(buf)) < 0) {

145

wpa_printf(MSG_ERROR, "EAP-SIM: Failed to derive keys");

146

return -1;

147

}

148

if (msk) {

149

os_memcpy(msk, buf, EAP_SIM_KEYING_DATA_LEN);

150

wpa_hexdump(MSG_DEBUG, "EAP-SIM: keying material (MSK)",

151

msk, EAP_SIM_KEYING_DATA_LEN);

152

}

153

if (emsk) {

154

os_memcpy(emsk, buf + EAP_SIM_KEYING_DATA_LEN, EAP_EMSK_LEN);

155

wpa_hexdump(MSG_DEBUG, "EAP-SIM: EMSK", emsk, EAP_EMSK_LEN);

156

}

157

os_memset(buf, 0, sizeof(buf));

158

159

return 0;

160

}

161

162

163

int eap_sim_verify_mac(const u8 *k_aut, const u8 *req, size_t req_len,

164

const u8 *mac, const u8 *extra, size_t extra_len)

165

{

166

unsigned char hmac[SHA1_MAC_LEN];

167

const u8 *addr[2];

168

size_t len[2];

169

u8 *tmp;

170

171

if (mac == NULL || req_len < EAP_SIM_MAC_LEN || mac < req ||

172

mac > req + req_len - EAP_SIM_MAC_LEN)

173

return -1;

174

175

tmp = os_malloc(req_len);

176

if (tmp == NULL)

177

return -1;

178

179

addr[0] = tmp;

180

len[0] = req_len;

181

addr[1] = extra;

182

len[1] = extra_len;

183

184

/* HMAC-SHA1-128 */

185

os_memcpy(tmp, req, req_len);

186

os_memset(tmp + (mac - req), 0, EAP_SIM_MAC_LEN);

187

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Verify MAC - msg", tmp, req_len);

188

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Verify MAC - extra data",

189

extra, extra_len);

190

wpa_hexdump_key(MSG_MSGDUMP, "EAP-SIM: Verify MAC - K_aut",

191

k_aut, EAP_SIM_K_AUT_LEN);

192

hmac_sha1_vector(k_aut, EAP_SIM_K_AUT_LEN, 2, addr, len, hmac);

193

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Verify MAC: MAC",

194

hmac, EAP_SIM_MAC_LEN);

195

os_free(tmp);

196

197

return (os_memcmp(hmac, mac, EAP_SIM_MAC_LEN) == 0) ? 0 : 1;

198

}

199

200

201

void eap_sim_add_mac(const u8 *k_aut, u8 *msg, size_t msg_len, u8 *mac,

202

const u8 *extra, size_t extra_len)

203

{

204

unsigned char hmac[SHA1_MAC_LEN];

205

const u8 *addr[2];

206

size_t len[2];

207

208

addr[0] = msg;

209

len[0] = msg_len;

210

addr[1] = extra;

211

len[1] = extra_len;

212

213

/* HMAC-SHA1-128 */

214

os_memset(mac, 0, EAP_SIM_MAC_LEN);

215

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Add MAC - msg", msg, msg_len);

216

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Add MAC - extra data",

217

extra, extra_len);

218

wpa_hexdump_key(MSG_MSGDUMP, "EAP-SIM: Add MAC - K_aut",

219

k_aut, EAP_SIM_K_AUT_LEN);

220

hmac_sha1_vector(k_aut, EAP_SIM_K_AUT_LEN, 2, addr, len, hmac);

221

os_memcpy(mac, hmac, EAP_SIM_MAC_LEN);

222

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Add MAC: MAC",

223

mac, EAP_SIM_MAC_LEN);

224

}

225

226

227

int eap_sim_parse_attr(const u8 *start, const u8 *end,

228

struct eap_sim_attrs *attr, int aka, int encr)

229

{

230

const u8 *pos = start, *apos;

231

size_t alen, plen, i, list_len;

232

233

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

234

attr->id_req = NO_ID_REQ;

235

attr->notification = -1;

236

attr->counter = -1;

237

attr->selected_version = -1;

238

attr->client_error_code = -1;

239

240

while (pos < end) {

241

if (pos + 2 > end) {

242

wpa_printf(MSG_INFO, "EAP-SIM: Attribute overflow(1)");

243

return -1;

244

}

245

wpa_printf(MSG_MSGDUMP, "EAP-SIM: Attribute: Type=%d Len=%d",

246

pos[0], pos[1] * 4);

247

if (pos + pos[1] * 4 > end) {

248

wpa_printf(MSG_INFO, "EAP-SIM: Attribute overflow "

249

"(pos=%p len=%d end=%p)",

250

pos, pos[1] * 4, end);

251

return -1;

252

}

253

apos = pos + 2;

254

alen = pos[1] * 4 - 2;

255

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Attribute data",

256

apos, alen);

257

258

switch (pos[0]) {

259

case EAP_SIM_AT_RAND:

260

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_RAND");

261

apos += 2;

262

alen -= 2;

263

if ((!aka && (alen % GSM_RAND_LEN)) ||

264

(aka && alen != EAP_AKA_RAND_LEN)) {

265

wpa_printf(MSG_INFO, "EAP-SIM: Invalid AT_RAND"

266

" (len %lu)",

267

(unsigned long) alen);

268

return -1;

269

}

270

attr->rand = apos;

271

attr->num_chal = alen / GSM_RAND_LEN;

272

break;

273

case EAP_SIM_AT_AUTN:

274

wpa_printf(MSG_DEBUG, "EAP-AKA: AT_AUTN");

275

if (!aka) {

276

wpa_printf(MSG_DEBUG, "EAP-SIM: "

277

"Unexpected AT_AUTN");

278

return -1;

279

}

280

apos += 2;

281

alen -= 2;

282

if (alen != EAP_AKA_AUTN_LEN) {

283

wpa_printf(MSG_INFO, "EAP-AKA: Invalid AT_AUTN"

284

" (len %lu)",

285

(unsigned long) alen);

286

return -1;

287

}

288

attr->autn = apos;

289

break;

290

case EAP_SIM_AT_PADDING:

291

if (!encr) {

292

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

293

"AT_PADDING");

294

return -1;

295

}

296

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) AT_PADDING");

297

for (i = 2; i < alen; i++) {

298

if (apos[i] != 0) {

299

wpa_printf(MSG_INFO, "EAP-SIM: (encr) "

300

"AT_PADDING used a non-zero"

301

" padding byte");

302

wpa_hexdump(MSG_DEBUG, "EAP-SIM: "

303

"(encr) padding bytes",

304

apos + 2, alen - 2);

305

return -1;

306

}

307

}

308

break;

309

case EAP_SIM_AT_NONCE_MT:

310

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_NONCE_MT");

311

if (alen != 2 + EAP_SIM_NONCE_MT_LEN) {

312

wpa_printf(MSG_INFO, "EAP-SIM: Invalid "

313

"AT_NONCE_MT length");

314

return -1;

315

}

316

attr->nonce_mt = apos + 2;

317

break;

318

case EAP_SIM_AT_PERMANENT_ID_REQ:

319

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_PERMANENT_ID_REQ");

320

attr->id_req = PERMANENT_ID;

321

break;

322

case EAP_SIM_AT_MAC:

323

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_MAC");

324

if (alen != 2 + EAP_SIM_MAC_LEN) {

325

wpa_printf(MSG_INFO, "EAP-SIM: Invalid AT_MAC "

326

"length");

327

return -1;

328

}

329

attr->mac = apos + 2;

330

break;

331

case EAP_SIM_AT_NOTIFICATION:

332

if (alen != 2) {

333

wpa_printf(MSG_INFO, "EAP-SIM: Invalid "

334

"AT_NOTIFICATION length %lu",

335

(unsigned long) alen);

336

return -1;

337

}

338

attr->notification = apos[0] * 256 + apos[1];

339

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_NOTIFICATION %d",

340

attr->notification);

341

break;

342

case EAP_SIM_AT_ANY_ID_REQ:

343

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_ANY_ID_REQ");

344

attr->id_req = ANY_ID;

345

break;

346

case EAP_SIM_AT_IDENTITY:

347

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_IDENTITY");

348

attr->identity = apos + 2;

349

attr->identity_len = alen - 2;

350

break;

351

case EAP_SIM_AT_VERSION_LIST:

352

if (aka) {

353

wpa_printf(MSG_DEBUG, "EAP-AKA: "

354

"Unexpected AT_VERSION_LIST");

355

return -1;

356

}

357

list_len = apos[0] * 256 + apos[1];

358

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_VERSION_LIST");

359

if (list_len < 2 || list_len > alen - 2) {

360

wpa_printf(MSG_WARNING, "EAP-SIM: Invalid "

361

"AT_VERSION_LIST (list_len=%lu "

362

"attr_len=%lu)",

363

(unsigned long) list_len,

364

(unsigned long) alen);

365

return -1;

366

}

367

attr->version_list = apos + 2;

368

attr->version_list_len = list_len;

369

break;

370

case EAP_SIM_AT_SELECTED_VERSION:

371

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_SELECTED_VERSION");

372

if (alen != 2) {

373

wpa_printf(MSG_INFO, "EAP-SIM: Invalid "

374

"AT_SELECTED_VERSION length %lu",

375

(unsigned long) alen);

376

return -1;

377

}

378

attr->selected_version = apos[0] * 256 + apos[1];

379

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_SELECTED_VERSION "

380

"%d", attr->selected_version);

381

break;

382

case EAP_SIM_AT_FULLAUTH_ID_REQ:

383

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_FULLAUTH_ID_REQ");

384

attr->id_req = FULLAUTH_ID;

385

break;

386

case EAP_SIM_AT_COUNTER:

387

if (!encr) {

388

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

389

"AT_COUNTER");

390

return -1;

391

}

392

if (alen != 2) {

393

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Invalid "

394

"AT_COUNTER (alen=%lu)",

395

(unsigned long) alen);

396

return -1;

397

}

398

attr->counter = apos[0] * 256 + apos[1];

399

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) AT_COUNTER %d",

400

attr->counter);

401

break;

402

case EAP_SIM_AT_COUNTER_TOO_SMALL:

403

if (!encr) {

404

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

405

"AT_COUNTER_TOO_SMALL");

406

return -1;

407

}

408

if (alen != 2) {

409

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Invalid "

410

"AT_COUNTER_TOO_SMALL (alen=%lu)",

411

(unsigned long) alen);

412

return -1;

413

}

414

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) "

415

"AT_COUNTER_TOO_SMALL");

416

attr->counter_too_small = 1;

417

break;

418

case EAP_SIM_AT_NONCE_S:

419

if (!encr) {

420

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

421

"AT_NONCE_S");

422

return -1;

423

}

424

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) "

425

"AT_NONCE_S");

426

if (alen != 2 + EAP_SIM_NONCE_S_LEN) {

427

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Invalid "

428

"AT_NONCE_S (alen=%lu)",

429

(unsigned long) alen);

430

return -1;

431

}

432

attr->nonce_s = apos + 2;

433

break;

434

case EAP_SIM_AT_CLIENT_ERROR_CODE:

435

if (alen != 2) {

436

wpa_printf(MSG_INFO, "EAP-SIM: Invalid "

437

"AT_CLIENT_ERROR_CODE length %lu",

438

(unsigned long) alen);

439

return -1;

440

}

441

attr->client_error_code = apos[0] * 256 + apos[1];

442

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_CLIENT_ERROR_CODE "

443

"%d", attr->client_error_code);

444

break;

445

case EAP_SIM_AT_IV:

446

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_IV");

447

if (alen != 2 + EAP_SIM_MAC_LEN) {

448

wpa_printf(MSG_INFO, "EAP-SIM: Invalid AT_IV "

449

"length %lu", (unsigned long) alen);

450

return -1;

451

}

452

attr->iv = apos + 2;

453

break;

454

case EAP_SIM_AT_ENCR_DATA:

455

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_ENCR_DATA");

456

attr->encr_data = apos + 2;

457

attr->encr_data_len = alen - 2;

458

if (attr->encr_data_len % 16) {

459

wpa_printf(MSG_INFO, "EAP-SIM: Invalid "

460

"AT_ENCR_DATA length %lu",

461

(unsigned long)

462

attr->encr_data_len);

463

return -1;

464

}

465

break;

466

case EAP_SIM_AT_NEXT_PSEUDONYM:

467

if (!encr) {

468

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

469

"AT_NEXT_PSEUDONYM");

470

return -1;

471

}

472

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) "

473

"AT_NEXT_PSEUDONYM");

474

plen = apos[0] * 256 + apos[1];

475

if (plen > alen - 2) {

476

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Invalid"

477

" AT_NEXT_PSEUDONYM (actual"

478

" len %lu, attr len %lu)",

479

(unsigned long) plen,

480

(unsigned long) alen);

481

return -1;

482

}

483

attr->next_pseudonym = pos + 4;

484

attr->next_pseudonym_len = plen;

485

break;

486

case EAP_SIM_AT_NEXT_REAUTH_ID:

487

if (!encr) {

488

wpa_printf(MSG_ERROR, "EAP-SIM: Unencrypted "

489

"AT_NEXT_REAUTH_ID");

490

return -1;

491

}

492

wpa_printf(MSG_DEBUG, "EAP-SIM: (encr) "

493

"AT_NEXT_REAUTH_ID");

494

plen = apos[0] * 256 + apos[1];

495

if (plen > alen - 2) {

496

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Invalid"

497

" AT_NEXT_REAUTH_ID (actual"

498

" len %lu, attr len %lu)",

499

(unsigned long) plen,

500

(unsigned long) alen);

501

return -1;

502

}

503

attr->next_reauth_id = pos + 4;

504

attr->next_reauth_id_len = plen;

505

break;

506

case EAP_SIM_AT_RES:

507

wpa_printf(MSG_DEBUG, "EAP-SIM: AT_RES");

508

apos += 2;

509

alen -= 2;

510

if (!aka || alen < EAP_AKA_MIN_RES_LEN ||

511

alen > EAP_AKA_MAX_RES_LEN) {

512

wpa_printf(MSG_INFO, "EAP-SIM: Invalid AT_RES "

513

"(len %lu)",

514

(unsigned long) alen);

515

return -1;

516

}

517

attr->res = apos;

518

attr->res_len = alen;

519

break;

520

case EAP_SIM_AT_AUTS:

521

wpa_printf(MSG_DEBUG, "EAP-AKA: AT_AUTS");

522

if (!aka) {

523

wpa_printf(MSG_DEBUG, "EAP-SIM: "

524

"Unexpected AT_AUTS");

525

return -1;

526

}

527

if (alen != EAP_AKA_AUTS_LEN) {

528

wpa_printf(MSG_INFO, "EAP-AKA: Invalid AT_AUTS"

529

" (len %lu)",

530

(unsigned long) alen);

531

return -1;

532

}

533

attr->auts = apos;

534

break;

535

default:

536

if (pos[0] < 128) {

537

wpa_printf(MSG_INFO, "EAP-SIM: Unrecognized "

538

"non-skippable attribute %d",

539

pos[0]);

540

return -1;

541

}

542

543

wpa_printf(MSG_DEBUG, "EAP-SIM: Unrecognized skippable"

544

" attribute %d ignored", pos[0]);

545

break;

546

}

547

548

pos += pos[1] * 4;

549

}

550

551

wpa_printf(MSG_DEBUG, "EAP-SIM: Attributes parsed successfully "

552

"(aka=%d encr=%d)", aka, encr);

553

554

return 0;

555

}

556

557

558

u8 * eap_sim_parse_encr(const u8 *k_encr, const u8 *encr_data,

559

size_t encr_data_len, const u8 *iv,

560

struct eap_sim_attrs *attr, int aka)

561

{

562

u8 *decrypted;

563

564

if (!iv) {

565

wpa_printf(MSG_INFO, "EAP-SIM: Encrypted data, but no IV");

566

return NULL;

567

}

568

569

decrypted = os_malloc(encr_data_len);

570

if (decrypted == NULL)

571

return NULL;

572

os_memcpy(decrypted, encr_data, encr_data_len);

573

574

aes_128_cbc_decrypt(k_encr, iv, decrypted, encr_data_len);

575

wpa_hexdump(MSG_MSGDUMP, "EAP-SIM: Decrypted AT_ENCR_DATA",

576

decrypted, encr_data_len);

577

578

if (eap_sim_parse_attr(decrypted, decrypted + encr_data_len, attr,

579

aka, 1)) {

580

wpa_printf(MSG_INFO, "EAP-SIM: (encr) Failed to parse "

581

"decrypted AT_ENCR_DATA");

582

os_free(decrypted);

583

return NULL;

584

}

585

586

return decrypted;

587

}

588

589

590

#define EAP_SIM_INIT_LEN 128

591

592

struct eap_sim_msg {

593

u8 *buf;

594

size_t buf_len, used;

595

size_t mac, iv, encr; /* index from buf */

596

};

597

598

599

struct eap_sim_msg * eap_sim_msg_init(int code, int id, int type, int subtype)

600

{

601

struct eap_sim_msg *msg;

602

struct eap_hdr *eap;

603

u8 *pos;

604

605

msg = os_zalloc(sizeof(*msg));

606

if (msg == NULL)

607

return NULL;

608

609

msg->buf = os_zalloc(EAP_SIM_INIT_LEN);

610

if (msg->buf == NULL) {

611

os_free(msg);

612

return NULL;

613

}

614

msg->buf_len = EAP_SIM_INIT_LEN;

615

eap = (struct eap_hdr *) msg->buf;

616

eap->code = code;

617

eap->identifier = id;

618

msg->used = sizeof(*eap);

619

620

pos = (u8 *) (eap + 1);

621

*pos++ = type;

622

*pos++ = subtype;

623

*pos++ = 0; /* Reserved */

624

*pos++ = 0; /* Reserved */

625

msg->used += 4;

626

627

return msg;

628

}

629

630

631

u8 * eap_sim_msg_finish(struct eap_sim_msg *msg, size_t *len, const u8 *k_aut,

632

const u8 *extra, size_t extra_len)

633

{

634

struct eap_hdr *eap;

635

u8 *buf;

636

637

if (msg == NULL)

638

return NULL;

639

640

eap = (struct eap_hdr *) msg->buf;

641

eap->length = host_to_be16(msg->used);

642

643

if (k_aut && msg->mac) {

644

eap_sim_add_mac(k_aut, msg->buf, msg->used,

645

msg->buf + msg->mac, extra, extra_len);

646

}

647

648

*len = msg->used;

649

buf = msg->buf;

650

os_free(msg);

651

return buf;

652

}

653

654

655

void eap_sim_msg_free(struct eap_sim_msg *msg)

656

{

657

if (msg) {

658

os_free(msg->buf);

659

os_free(msg);

660

}

661

}

662

663

664

static int eap_sim_msg_resize(struct eap_sim_msg *msg, size_t add_len)

665

{

666

if (msg->used + add_len > msg->buf_len) {

667

u8 *nbuf = os_realloc(msg->buf, msg->used + add_len);

668

if (nbuf == NULL)

669

return -1;

670

msg->buf = nbuf;

671

msg->buf_len = msg->used + add_len;

672

}

673

return 0;

674

}

675

676

677

u8 * eap_sim_msg_add_full(struct eap_sim_msg *msg, u8 attr,

678

const u8 *data, size_t len)

679

{

680

int attr_len = 2 + len;

681

int pad_len;

682

u8 *start, *pos;

683

684

if (msg == NULL)

685

return NULL;

686

687

pad_len = (4 - attr_len % 4) % 4;

688

attr_len += pad_len;

689

if (eap_sim_msg_resize(msg, attr_len))

690

return NULL;

691

start = pos = msg->buf + msg->used;

692

*pos++ = attr;

693

*pos++ = attr_len / 4;

694

os_memcpy(pos, data, len);

695

if (pad_len) {

696

pos += len;

697

os_memset(pos, 0, pad_len);

698

}

699

msg->used += attr_len;

700

return start;

701

}

702

703

704

u8 * eap_sim_msg_add(struct eap_sim_msg *msg, u8 attr, u16 value,

705

const u8 *data, size_t len)

706

{

707

int attr_len = 4 + len;

708

int pad_len;

709

u8 *start, *pos;

710

711

if (msg == NULL)

712

return NULL;

713

714

pad_len = (4 - attr_len % 4) % 4;

715

attr_len += pad_len;

716

if (eap_sim_msg_resize(msg, attr_len))

717

return NULL;

718

start = pos = msg->buf + msg->used;

719

*pos++ = attr;

720

*pos++ = attr_len / 4;

721

WPA_PUT_BE16(pos, value);

722

pos += 2;

723

if (data)

724

os_memcpy(pos, data, len);

725

if (pad_len) {

726

pos += len;

727

os_memset(pos, 0, pad_len);

728

}

729

msg->used += attr_len;

730

return start;

731

}

732

733

734

u8 * eap_sim_msg_add_mac(struct eap_sim_msg *msg, u8 attr)

735

{

736

u8 *pos = eap_sim_msg_add(msg, attr, 0, NULL, EAP_SIM_MAC_LEN);

737

if (pos)

738

msg->mac = (pos - msg->buf) + 4;

739

return pos;

740

}

741

742

743

int eap_sim_msg_add_encr_start(struct eap_sim_msg *msg, u8 attr_iv,

744

u8 attr_encr)

745

{

746

u8 *pos = eap_sim_msg_add(msg, attr_iv, 0, NULL, EAP_SIM_IV_LEN);

747

if (pos == NULL)

748

return -1;

749

msg->iv = (pos - msg->buf) + 4;

750

if (hostapd_get_rand(msg->buf + msg->iv, EAP_SIM_IV_LEN)) {

751

msg->iv = 0;

752

return -1;

753

}

754

755

pos = eap_sim_msg_add(msg, attr_encr, 0, NULL, 0);

756

if (pos == NULL) {

757

msg->iv = 0;

758

return -1;

759

}

760

msg->encr = pos - msg->buf;

761

762

return 0;

763

}

764

765

766

int eap_sim_msg_add_encr_end(struct eap_sim_msg *msg, u8 *k_encr, int attr_pad)

767

{

768

size_t encr_len;

769

770

if (msg == NULL || k_encr == NULL || msg->iv == 0 || msg->encr == 0)

771

return -1;

772

773

encr_len = msg->used - msg->encr - 4;

774

if (encr_len % 16) {

775

u8 *pos;

776

int pad_len = 16 - (encr_len % 16);

777

if (pad_len < 4) {

778

wpa_printf(MSG_WARNING, "EAP-SIM: "

779

"eap_sim_msg_add_encr_end - invalid pad_len"

780

" %d", pad_len);

781

return -1;

782

}

783

wpa_printf(MSG_DEBUG, " *AT_PADDING");

784

pos = eap_sim_msg_add(msg, attr_pad, 0, NULL, pad_len - 4);

785

if (pos == NULL)

786

return -1;

787

os_memset(pos + 4, 0, pad_len - 4);

788

encr_len += pad_len;

789

}

790

wpa_printf(MSG_DEBUG, " (AT_ENCR_DATA data len %lu)",

791

(unsigned long) encr_len);

792

msg->buf[msg->encr + 1] = encr_len / 4 + 1;

793

aes_128_cbc_encrypt(k_encr, msg->buf + msg->iv,

794

msg->buf + msg->encr + 4, encr_len);

795

796

return 0;

797

}

798

799

800

void eap_sim_report_notification(void *msg_ctx, int notification, int aka)

801

{

802

#ifndef CONFIG_NO_STDOUT_DEBUG

803

const char *type = aka ? "AKA" : "SIM";

804

#endif /* CONFIG_NO_STDOUT_DEBUG */

805

806

switch (notification) {

807

case EAP_SIM_GENERAL_FAILURE_AFTER_AUTH:

808

wpa_printf(MSG_WARNING, "EAP-%s: General failure "

809

"notification (after authentication)", type);

810

break;

811

case EAP_SIM_TEMPORARILY_DENIED:

812

wpa_printf(MSG_WARNING, "EAP-%s: Failure notification: "

813

"User has been temporarily denied access to the "

814

"requested service", type);

815

break;

816

case EAP_SIM_NOT_SUBSCRIBED:

817

wpa_printf(MSG_WARNING, "EAP-%s: Failure notification: "

818

"User has not subscribed to the requested service",

819

type);

820

break;

821

case EAP_SIM_GENERAL_FAILURE_BEFORE_AUTH:

822

wpa_printf(MSG_WARNING, "EAP-%s: General failure "

823

"notification (before authentication)", type);

824

break;

825

case EAP_SIM_SUCCESS:

826

wpa_printf(MSG_INFO, "EAP-%s: Successful authentication "

827

"notification", type);

828

break;

829

default:

830

if (notification >= 32768) {

831

wpa_printf(MSG_INFO, "EAP-%s: Unrecognized "

832

"non-failure notification %d",

833

type, notification);

834

} else {

835

wpa_printf(MSG_WARNING, "EAP-%s: Unrecognized "

836

"failure notification %d",

837

type, notification);

838

}

839

}

840

}

Older »