aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2007-03-09 04:20:55 (GMT)
committerJouni Malinen <j@w1.fi>2007-03-09 04:20:55 (GMT)
commit715acb75147520a30f7132b20f6b107a981bfc27 (patch)
treed88aa3daab7609a67e41318ea9c964247863b3b9
parent57bc28b8a163c4d9f2bfda2ffae5db84c719a764 (diff)
downloadhostap-history-715acb75147520a30f7132b20f6b107a981bfc27.zip
hostap-history-715acb75147520a30f7132b20f6b107a981bfc27.tar.gz
hostap-history-715acb75147520a30f7132b20f6b107a981bfc27.tar.bz2
Updated my email address jkmaline@cc.hut.fi to j@w1.fi since the HUT
address is about to be removed.
-rw-r--r--hostapd/README2
-rw-r--r--hostapd/accounting.c2
-rw-r--r--hostapd/accounting.h2
-rw-r--r--hostapd/ap.h2
-rw-r--r--hostapd/ap_list.c2
-rw-r--r--hostapd/ap_list.h2
-rw-r--r--hostapd/config.c2
-rw-r--r--hostapd/config.h2
-rw-r--r--hostapd/ctrl_iface.c2
-rw-r--r--hostapd/ctrl_iface.h2
-rwxr-xr-xhostapd/doc/kerneldoc2doxygen.pl2
-rw-r--r--hostapd/doc/mainpage.doxygen2
-rw-r--r--hostapd/driver.h2
-rw-r--r--hostapd/driver_devicescape.c2
-rw-r--r--hostapd/driver_hostap.c2
-rw-r--r--hostapd/driver_madwifi.c2
-rw-r--r--hostapd/driver_prism54.c2
-rw-r--r--hostapd/driver_test.c2
-rw-r--r--hostapd/driver_wired.c2
-rw-r--r--hostapd/drivers.c2
-rw-r--r--hostapd/eapol_sm.c2
-rw-r--r--hostapd/eapol_sm.h2
-rw-r--r--hostapd/hlr_auc_gw.c4
-rw-r--r--hostapd/hostap_common.h2
-rw-r--r--hostapd/hostapd.82
-rw-r--r--hostapd/hostapd.c4
-rw-r--r--hostapd/hostapd.h2
-rw-r--r--hostapd/hostapd_cli.12
-rw-r--r--hostapd/hostapd_cli.c4
-rw-r--r--hostapd/iapp.c2
-rw-r--r--hostapd/iapp.h2
-rw-r--r--hostapd/ieee802_11.c2
-rw-r--r--hostapd/ieee802_11.h2
-rw-r--r--hostapd/ieee802_11_auth.c2
-rw-r--r--hostapd/ieee802_11_auth.h2
-rw-r--r--hostapd/ieee802_11h.c2
-rw-r--r--hostapd/ieee802_11h.h2
-rw-r--r--hostapd/ieee802_1x.c2
-rw-r--r--hostapd/ieee802_1x.h2
-rw-r--r--hostapd/milenage.c2
-rw-r--r--hostapd/milenage.h2
-rw-r--r--hostapd/mlme.c2
-rw-r--r--hostapd/mlme.h2
-rw-r--r--hostapd/nt_password_hash.c2
-rw-r--r--hostapd/peerkey.c2
-rw-r--r--hostapd/pmksa_cache.c2
-rw-r--r--hostapd/pmksa_cache.h2
-rw-r--r--hostapd/preauth.c2
-rw-r--r--hostapd/preauth.h2
-rw-r--r--hostapd/reconfig.c2
-rw-r--r--hostapd/sta_info.c2
-rw-r--r--hostapd/sta_info.h2
-rw-r--r--hostapd/wpa.c2
-rw-r--r--hostapd/wpa.h2
-rw-r--r--hostapd/wpa_auth_i.h2
-rw-r--r--hostapd/wpa_auth_ie.c2
-rw-r--r--hostapd/wpa_auth_ie.h2
-rw-r--r--hostapd/wpa_ft.c2
-rw-r--r--src/common/defs.h2
-rw-r--r--src/common/ieee802_11_defs.h2
-rw-r--r--src/common/wireless_copy.h2
-rw-r--r--src/common/wpa_common.c2
-rw-r--r--src/common/wpa_common.h2
-rw-r--r--src/common/wpa_ctrl.c2
-rw-r--r--src/common/wpa_ctrl.h2
-rw-r--r--src/crypto/aes.c2
-rw-r--r--src/crypto/aes.h2
-rw-r--r--src/crypto/aes_wrap.c2
-rw-r--r--src/crypto/aes_wrap.h2
-rw-r--r--src/crypto/crypto.h2
-rw-r--r--src/crypto/crypto_cryptoapi.c2
-rw-r--r--src/crypto/crypto_gnutls.c2
-rw-r--r--src/crypto/crypto_internal.c2
-rw-r--r--src/crypto/crypto_libtomcrypt.c2
-rw-r--r--src/crypto/crypto_none.c2
-rw-r--r--src/crypto/crypto_openssl.c2
-rw-r--r--src/crypto/des.c2
-rw-r--r--src/crypto/md4.c2
-rw-r--r--src/crypto/md5.c2
-rw-r--r--src/crypto/md5.h2
-rw-r--r--src/crypto/ms_funcs.c2
-rw-r--r--src/crypto/ms_funcs.h2
-rw-r--r--src/crypto/rc4.c2
-rw-r--r--src/crypto/rc4.h2
-rw-r--r--src/crypto/sha1.c6
-rw-r--r--src/crypto/sha1.h2
-rw-r--r--src/crypto/sha256.c2
-rw-r--r--src/crypto/sha256.h2
-rw-r--r--src/crypto/tls.h2
-rw-r--r--src/crypto/tls_gnutls.c2
-rw-r--r--src/crypto/tls_internal.c2
-rw-r--r--src/crypto/tls_none.c2
-rw-r--r--src/crypto/tls_openssl.c2
-rw-r--r--src/crypto/tls_schannel.c2
-rw-r--r--src/drivers/driver.h2
-rw-r--r--src/drivers/driver_atmel.c2
-rw-r--r--src/drivers/driver_broadcom.c2
-rw-r--r--src/drivers/driver_hostap.c2
-rw-r--r--src/drivers/driver_hostap.h2
-rw-r--r--src/drivers/driver_ipw.c2
-rw-r--r--src/drivers/driver_madwifi.c2
-rw-r--r--src/drivers/driver_ndis.c2
-rw-r--r--src/drivers/driver_ndis.h2
-rw-r--r--src/drivers/driver_ndis_.c2
-rw-r--r--src/drivers/driver_ndiswrapper.c2
-rw-r--r--src/drivers/driver_prism54.c2
-rw-r--r--src/drivers/driver_test.c2
-rw-r--r--src/drivers/driver_wext.c2
-rw-r--r--src/drivers/driver_wext.h2
-rw-r--r--src/drivers/driver_wired.c2
-rw-r--r--src/drivers/drivers.c2
-rw-r--r--src/eap_common/eap_common.c2
-rw-r--r--src/eap_common/eap_common.h2
-rw-r--r--src/eap_common/eap_defs.h2
-rw-r--r--src/eap_common/eap_gpsk_common.c2
-rw-r--r--src/eap_common/eap_gpsk_common.h2
-rw-r--r--src/eap_common/eap_pax_common.c2
-rw-r--r--src/eap_common/eap_pax_common.h2
-rw-r--r--src/eap_common/eap_psk_common.c2
-rw-r--r--src/eap_common/eap_psk_common.h2
-rw-r--r--src/eap_common/eap_sake_common.c2
-rw-r--r--src/eap_common/eap_sake_common.h2
-rw-r--r--src/eap_common/eap_sim_common.c2
-rw-r--r--src/eap_common/eap_sim_common.h2
-rw-r--r--src/eap_common/eap_ttls.h2
-rw-r--r--src/eap_peer/eap.c2
-rw-r--r--src/eap_peer/eap.h2
-rw-r--r--src/eap_peer/eap_aka.c2
-rw-r--r--src/eap_peer/eap_fast.c2
-rw-r--r--src/eap_peer/eap_fast_pac.c2
-rw-r--r--src/eap_peer/eap_fast_pac.h2
-rw-r--r--src/eap_peer/eap_gpsk.c2
-rw-r--r--src/eap_peer/eap_gtc.c2
-rw-r--r--src/eap_peer/eap_i.h2
-rw-r--r--src/eap_peer/eap_leap.c2
-rw-r--r--src/eap_peer/eap_md5.c2
-rw-r--r--src/eap_peer/eap_methods.c2
-rw-r--r--src/eap_peer/eap_methods.h2
-rw-r--r--src/eap_peer/eap_mschapv2.c2
-rw-r--r--src/eap_peer/eap_otp.c2
-rw-r--r--src/eap_peer/eap_pax.c2
-rw-r--r--src/eap_peer/eap_peap.c2
-rw-r--r--src/eap_peer/eap_psk.c2
-rw-r--r--src/eap_peer/eap_sake.c2
-rw-r--r--src/eap_peer/eap_sim.c2
-rw-r--r--src/eap_peer/eap_tls.c2
-rw-r--r--src/eap_peer/eap_tls_common.c2
-rw-r--r--src/eap_peer/eap_tls_common.h2
-rw-r--r--src/eap_peer/eap_tlv.c2
-rw-r--r--src/eap_peer/eap_tlv.h2
-rw-r--r--src/eap_peer/eap_ttls.c2
-rw-r--r--src/eap_peer/eap_vendor_test.c2
-rw-r--r--src/eap_server/eap.c2
-rw-r--r--src/eap_server/eap.h2
-rw-r--r--src/eap_server/eap_aka.c2
-rw-r--r--src/eap_server/eap_gpsk.c2
-rw-r--r--src/eap_server/eap_gtc.c2
-rw-r--r--src/eap_server/eap_i.h2
-rw-r--r--src/eap_server/eap_identity.c2
-rw-r--r--src/eap_server/eap_md5.c2
-rw-r--r--src/eap_server/eap_methods.c2
-rw-r--r--src/eap_server/eap_methods.h2
-rw-r--r--src/eap_server/eap_mschapv2.c2
-rw-r--r--src/eap_server/eap_pax.c2
-rw-r--r--src/eap_server/eap_peap.c2
-rw-r--r--src/eap_server/eap_psk.c2
-rw-r--r--src/eap_server/eap_sake.c2
-rw-r--r--src/eap_server/eap_sim.c2
-rw-r--r--src/eap_server/eap_sim_db.c2
-rw-r--r--src/eap_server/eap_sim_db.h2
-rw-r--r--src/eap_server/eap_tls.c2
-rw-r--r--src/eap_server/eap_tls_common.c2
-rw-r--r--src/eap_server/eap_tls_common.h2
-rw-r--r--src/eap_server/eap_tlv.c2
-rw-r--r--src/eap_server/eap_ttls.c2
-rw-r--r--src/eap_server/eap_vendor_test.c2
-rw-r--r--src/l2_packet/l2_packet.h2
-rw-r--r--src/l2_packet/l2_packet_freebsd.c2
-rw-r--r--src/l2_packet/l2_packet_linux.c2
-rw-r--r--src/l2_packet/l2_packet_ndis.c2
-rw-r--r--src/l2_packet/l2_packet_none.c2
-rw-r--r--src/l2_packet/l2_packet_pcap.c2
-rw-r--r--src/l2_packet/l2_packet_winpcap.c2
-rw-r--r--src/radius/radius.c2
-rw-r--r--src/radius/radius.h2
-rw-r--r--src/radius/radius_client.c2
-rw-r--r--src/radius/radius_client.h2
-rw-r--r--src/radius/radius_server.c2
-rw-r--r--src/radius/radius_server.h2
-rw-r--r--src/tls/asn1.c2
-rw-r--r--src/tls/asn1.h2
-rw-r--r--src/tls/asn1_test.c2
-rw-r--r--src/tls/bignum.c2
-rw-r--r--src/tls/bignum.h2
-rw-r--r--src/tls/rsa.c2
-rw-r--r--src/tls/rsa.h2
-rw-r--r--src/tls/tlsv1_client.c2
-rw-r--r--src/tls/tlsv1_client.h2
-rw-r--r--src/tls/tlsv1_common.c2
-rw-r--r--src/tls/tlsv1_common.h2
-rw-r--r--src/tls/x509v3.c2
-rw-r--r--src/tls/x509v3.h2
-rw-r--r--src/utils/base64.c2
-rw-r--r--src/utils/base64.h2
-rw-r--r--src/utils/build_config.h2
-rw-r--r--src/utils/common.c2
-rw-r--r--src/utils/common.h2
-rw-r--r--src/utils/eloop.c2
-rw-r--r--src/utils/eloop.h2
-rw-r--r--src/utils/eloop_none.c2
-rw-r--r--src/utils/eloop_win.c2
-rw-r--r--src/utils/includes.h2
-rw-r--r--src/utils/ip_addr.c2
-rw-r--r--src/utils/ip_addr.h2
-rw-r--r--src/utils/os.h2
-rw-r--r--src/utils/os_internal.c2
-rw-r--r--src/utils/os_none.c2
-rw-r--r--src/utils/os_unix.c2
-rw-r--r--src/utils/os_win32.c2
-rw-r--r--src/utils/state_machine.h2
-rw-r--r--testing/wireless/wireless-18.h2
-rw-r--r--testing/wireless/wireless-19.h2
-rw-r--r--wpa_supplicant/README2
-rw-r--r--wpa_supplicant/README-Windows.txt2
-rw-r--r--wpa_supplicant/config.c2
-rw-r--r--wpa_supplicant/config.h2
-rw-r--r--wpa_supplicant/config_file.c2
-rw-r--r--wpa_supplicant/config_none.c2
-rw-r--r--wpa_supplicant/config_ssid.h2
-rw-r--r--wpa_supplicant/config_winreg.c2
-rw-r--r--wpa_supplicant/ctrl_iface.c2
-rw-r--r--wpa_supplicant/ctrl_iface.h2
-rw-r--r--wpa_supplicant/ctrl_iface_named_pipe.c2
-rw-r--r--wpa_supplicant/ctrl_iface_udp.c2
-rw-r--r--wpa_supplicant/ctrl_iface_unix.c2
-rw-r--r--wpa_supplicant/doc/docbook/wpa_background.sgml4
-rw-r--r--wpa_supplicant/doc/docbook/wpa_cli.sgml4
-rw-r--r--wpa_supplicant/doc/docbook/wpa_passphrase.sgml4
-rw-r--r--wpa_supplicant/doc/docbook/wpa_supplicant.sgml4
-rwxr-xr-xwpa_supplicant/doc/kerneldoc2doxygen.pl2
-rw-r--r--wpa_supplicant/doc/mainpage.doxygen2
-rw-r--r--wpa_supplicant/eap_testing.txt2
-rw-r--r--wpa_supplicant/eapol_sm.c2
-rw-r--r--wpa_supplicant/eapol_sm.h2
-rw-r--r--wpa_supplicant/eapol_test.c2
-rw-r--r--wpa_supplicant/events.c2
-rw-r--r--wpa_supplicant/main.c2
-rw-r--r--wpa_supplicant/main_none.c2
-rw-r--r--wpa_supplicant/main_winmain.c2
-rw-r--r--wpa_supplicant/main_winsvc.c2
-rw-r--r--wpa_supplicant/mlme.c2
-rw-r--r--wpa_supplicant/mlme.h2
-rw-r--r--wpa_supplicant/ndis_events.c2
-rw-r--r--wpa_supplicant/pcsc_funcs.c2
-rw-r--r--wpa_supplicant/pcsc_funcs.h2
-rw-r--r--wpa_supplicant/peerkey.c2
-rw-r--r--wpa_supplicant/peerkey.h2
-rw-r--r--wpa_supplicant/pmksa_cache.c2
-rw-r--r--wpa_supplicant/pmksa_cache.h2
-rw-r--r--wpa_supplicant/preauth.c2
-rw-r--r--wpa_supplicant/preauth.h2
-rw-r--r--wpa_supplicant/preauth_test.c2
-rw-r--r--wpa_supplicant/priv_netlink.h2
-rw-r--r--wpa_supplicant/tests/test_aes.c2
-rw-r--r--wpa_supplicant/tests/test_eap_sim_common.c2
-rw-r--r--wpa_supplicant/tests/test_md4.c2
-rw-r--r--wpa_supplicant/tests/test_md5.c2
-rw-r--r--wpa_supplicant/tests/test_ms_funcs.c2
-rw-r--r--wpa_supplicant/tests/test_sha1.c2
-rw-r--r--wpa_supplicant/tests/test_sha256.c2
-rw-r--r--wpa_supplicant/tests/test_wpa.c2
-rw-r--r--wpa_supplicant/tests/test_x509v3.c2
-rw-r--r--wpa_supplicant/win_if_list.c2
-rw-r--r--wpa_supplicant/wpa.c2
-rw-r--r--wpa_supplicant/wpa.h2
-rw-r--r--wpa_supplicant/wpa_cli.c4
-rw-r--r--wpa_supplicant/wpa_ft.c2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/eventhistory.cpp2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/eventhistory.h2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/main.cpp2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/networkconfig.cpp2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/networkconfig.h2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/scanresults.cpp2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/scanresults.h2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/userdatarequest.h2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/wpagui.cpp4
-rw-r--r--wpa_supplicant/wpa_gui-qt4/wpagui.h2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/wpamsg.h2
-rw-r--r--wpa_supplicant/wpa_gui/wpagui.ui.h2
-rw-r--r--wpa_supplicant/wpa_i.h2
-rw-r--r--wpa_supplicant/wpa_ie.c2
-rw-r--r--wpa_supplicant/wpa_ie.h2
-rw-r--r--wpa_supplicant/wpa_passphrase.c2
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
-rw-r--r--wpa_supplicant/wpa_supplicant_i.h2
-rw-r--r--www/cvs.html4
-rw-r--r--www/hostapd/index.html8
-rw-r--r--www/index.html14
-rw-r--r--www/links.html6
-rw-r--r--www/releases.html4
-rw-r--r--www/wpa_supplicant/conf/auth_modes.html2
-rw-r--r--www/wpa_supplicant/conf/configure.html2
-rw-r--r--www/wpa_supplicant/conf/eap-peap.html2
-rw-r--r--www/wpa_supplicant/conf/eap-tls.html2
-rw-r--r--www/wpa_supplicant/conf/eap.html2
-rw-r--r--www/wpa_supplicant/conf/index.html2
-rw-r--r--www/wpa_supplicant/index.html8
-rw-r--r--www/wpa_supplicant/support.html4
-rw-r--r--www/wpa_supplicant/wpa_gui.html4
310 files changed, 340 insertions, 340 deletions
diff --git a/hostapd/README b/hostapd/README
index 77984d7..994a5e1 100644
--- a/hostapd/README
+++ b/hostapd/README
@@ -2,7 +2,7 @@ hostapd - user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP
Authenticator and RADIUS authentication server
================================================================
-Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi> and
+Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi> and
contributors
All Rights Reserved.
diff --git a/hostapd/accounting.c b/hostapd/accounting.c
index eadff17..26bcd64 100644
--- a/hostapd/accounting.c
+++ b/hostapd/accounting.c
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS Accounting
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/accounting.h b/hostapd/accounting.h
index 8d2f093..ee2ee64 100644
--- a/hostapd/accounting.h
+++ b/hostapd/accounting.h
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS Accounting
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ap.h b/hostapd/ap.h
index 7c91909..b73c5b4 100644
--- a/hostapd/ap.h
+++ b/hostapd/ap.h
@@ -1,6 +1,6 @@
/*
* hostapd / Station table data structures
- * Copyright (c) 2002-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index 6883a7c..f2d3221 100644
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -1,6 +1,6 @@
/*
* hostapd / AP table
- * Copyright 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2002-2003, Jouni Malinen <j@w1.fi>
* Copyright 2003-2004, Instant802 Networks, Inc.
* Copyright 2006, Devicescape Software, Inc.
*
diff --git a/hostapd/ap_list.h b/hostapd/ap_list.h
index 75bf1a0..668d909 100644
--- a/hostapd/ap_list.h
+++ b/hostapd/ap_list.h
@@ -1,6 +1,6 @@
/*
* hostapd / AP table
- * Copyright 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2002-2003, Jouni Malinen <j@w1.fi>
* Copyright 2003-2004, Instant802 Networks, Inc.
* Copyright 2006, Devicescape Software, Inc.
*
diff --git a/hostapd/config.c b/hostapd/config.c
index 2da9908..1fb1f27 100644
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -1,6 +1,6 @@
/*
* hostapd / Configuration file
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/config.h b/hostapd/config.h
index 830d3ad..9bf4dcc 100644
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -1,6 +1,6 @@
/*
* hostapd / Configuration file
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 6da82a7..7c0476e 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1,6 +1,6 @@
/*
* hostapd / UNIX domain socket -based control interface
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ctrl_iface.h b/hostapd/ctrl_iface.h
index 96b25fb..2ac2f3b 100644
--- a/hostapd/ctrl_iface.h
+++ b/hostapd/ctrl_iface.h
@@ -1,6 +1,6 @@
/*
* hostapd / UNIX domain socket -based control interface
- * Copyright (c) 2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/doc/kerneldoc2doxygen.pl b/hostapd/doc/kerneldoc2doxygen.pl
index daec483..68835a1 100755
--- a/hostapd/doc/kerneldoc2doxygen.pl
+++ b/hostapd/doc/kerneldoc2doxygen.pl
@@ -20,7 +20,7 @@
#
##########################################################################
# Copyright (C) 2003 Jonathan Foster <jon@jon-foster.co.uk>
-# Copyright (C) 2005 Jouni Malinen <jkmaline@cc.hut.fi>
+# Copyright (C) 2005 Jouni Malinen <j@w1.fi>
# (modified for kerneldoc format used in wpa_supplicant)
#
# This program is free software; you can redistribute it and/or modify
diff --git a/hostapd/doc/mainpage.doxygen b/hostapd/doc/mainpage.doxygen
index b3a7688..7cf95de 100644
--- a/hostapd/doc/mainpage.doxygen
+++ b/hostapd/doc/mainpage.doxygen
@@ -13,7 +13,7 @@ give enough information for other developers to understand how hostapd
has been implemented, how it can be modified, how new drivers can be
supported, and how hostapd can be ported to other operating
systems. If any information is missing, feel free to contact Jouni
-Malinen <jkmaline@cc.hut.fi> for more information. Contributions as
+Malinen <j@w1.fi> for more information. Contributions as
patch files are also very welcome at the same address. Please note
that hostapd is licensed under dual license, GPLv2 or BSD at user's
choice. All contributions to hostapd are expected to use compatible
diff --git a/hostapd/driver.h b/hostapd/driver.h
index f625865..efb143f 100644
--- a/hostapd/driver.h
+++ b/hostapd/driver.h
@@ -1,6 +1,6 @@
/*
* hostapd - driver interface definition
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/driver_devicescape.c b/hostapd/driver_devicescape.c
index 0fa4264..b6f5441 100644
--- a/hostapd/driver_devicescape.c
+++ b/hostapd/driver_devicescape.c
@@ -1,6 +1,6 @@
/*
* hostapd / Kernel driver communication with Devicescape IEEE 802.11 stack
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
* Copyright (c) 2003-2004, Instant802 Networks, Inc.
* Copyright (c) 2005-2006, Devicescape Software, Inc.
*
diff --git a/hostapd/driver_hostap.c b/hostapd/driver_hostap.c
index df93f0c..bdd9c68 100644
--- a/hostapd/driver_hostap.c
+++ b/hostapd/driver_hostap.c
@@ -1,6 +1,6 @@
/*
* hostapd / Kernel driver communication with Linux Host AP driver
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/driver_madwifi.c b/hostapd/driver_madwifi.c
index 0e43fb7..689a7b4 100644
--- a/hostapd/driver_madwifi.c
+++ b/hostapd/driver_madwifi.c
@@ -2,7 +2,7 @@
* hostapd / Driver interaction with MADWIFI 802.11 driver
* Copyright (c) 2004, Sam Leffler <sam@errno.com>
* Copyright (c) 2004, Video54 Technologies
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/driver_prism54.c b/hostapd/driver_prism54.c
index e7823b1..90be277 100644
--- a/hostapd/driver_prism54.c
+++ b/hostapd/driver_prism54.c
@@ -2,7 +2,7 @@
* hostapd / Driver interaction with Prism54 PIMFOR interface
* Copyright (c) 2004, Bell Kin <bell_kin@pek.com.tw>
* based on hostap driver.c, ieee802_11.c
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/driver_test.c b/hostapd/driver_test.c
index c5f4261..a1c7cec 100644
--- a/hostapd/driver_test.c
+++ b/hostapd/driver_test.c
@@ -1,6 +1,6 @@
/*
* hostapd / Driver interface for development testing
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/driver_wired.c b/hostapd/driver_wired.c
index fedde71..ba471ef 100644
--- a/hostapd/driver_wired.c
+++ b/hostapd/driver_wired.c
@@ -1,6 +1,6 @@
/*
* hostapd / Kernel driver communication for wired (Ethernet) drivers
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004, Gunter Burchardt <tira@isx.de>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/hostapd/drivers.c b/hostapd/drivers.c
index f132829..17a015f 100644
--- a/hostapd/drivers.c
+++ b/hostapd/drivers.c
@@ -1,6 +1,6 @@
/*
* hostapd / driver interface list
- * Copyright (c) 2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/eapol_sm.c b/hostapd/eapol_sm.c
index fe7f46f..ec9c95b 100644
--- a/hostapd/eapol_sm.c
+++ b/hostapd/eapol_sm.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.1X Authenticator - EAPOL state machine
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/eapol_sm.h b/hostapd/eapol_sm.h
index 9ba7883..61d7bdb 100644
--- a/hostapd/eapol_sm.h
+++ b/hostapd/eapol_sm.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.1X Authenticator - EAPOL state machine
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/hlr_auc_gw.c b/hostapd/hlr_auc_gw.c
index 126dfee..dfff3de 100644
--- a/hostapd/hlr_auc_gw.c
+++ b/hostapd/hlr_auc_gw.c
@@ -1,6 +1,6 @@
/*
* HLR/AuC testing gateway for hostapd EAP-SIM/AKA database/authenticator
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
@@ -650,7 +650,7 @@ static void usage(void)
{
printf("HLR/AuC testing gateway for hostapd EAP-SIM/AKA "
"database/authenticator\n"
- "Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>\n"
+ "Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>\n"
"\n"
"usage:\n"
"hlr_auc_gw [-h] [-s<socket path>] [-g<triplet file>] "
diff --git a/hostapd/hostap_common.h b/hostapd/hostap_common.h
index 440ea06..1e38df3 100644
--- a/hostapd/hostap_common.h
+++ b/hostapd/hostap_common.h
@@ -1,6 +1,6 @@
/*
* hostapd / Kernel driver communication with Linux Host AP driver
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/hostapd.8 b/hostapd/hostapd.8
index bd4912f..9258512 100644
--- a/hostapd/hostapd.8
+++ b/hostapd/hostapd.8
@@ -53,7 +53,7 @@ Show hostapd version.
.SH SEE ALSO
.BR hostapd_cli (1).
.SH AUTHOR
-hostapd was written by Jouni Malinen <jkmaline@cc.hut.fi>.
+hostapd was written by Jouni Malinen <j@w1.fi>.
.PP
This manual page was written by Faidon Liambotis <faidon@cube.gr>,
for the Debian project (but may be used by others).
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 63aa4f1..60e701e 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -1,6 +1,6 @@
/*
* hostapd / Initialization and configuration
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
@@ -1556,7 +1556,7 @@ static void show_version(void)
"hostapd v" VERSION_STR "\n"
"User space daemon for IEEE 802.11 AP management,\n"
"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
- "Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi> "
+ "Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi> "
"and contributors\n");
}
diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 546aedc..7cbf844 100644
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -1,7 +1,7 @@
/*
* hostapd / Initialization and configuration
* Host AP kernel driver
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/hostapd_cli.1 b/hostapd/hostapd_cli.1
index 062fc78..8d6587f 100644
--- a/hostapd/hostapd_cli.1
+++ b/hostapd/hostapd_cli.1
@@ -77,7 +77,7 @@ Exit hostapd_cli.
.SH SEE ALSO
.BR hostapd (8).
.SH AUTHOR
-hostapd_cli was written by Jouni Malinen <jkmaline@cc.hut.fi>.
+hostapd_cli was written by Jouni Malinen <j@w1.fi>.
.PP
This manual page was written by Faidon Liambotis <faidon@cube.gr>,
for the Debian project (but may be used by others).
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 010af66..ca68352 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -1,6 +1,6 @@
/*
* hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
@@ -22,7 +22,7 @@
static const char *hostapd_cli_version =
"hostapd_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi> and contributors";
+"Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi> and contributors";
static const char *hostapd_cli_license =
diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index a7c8f39..02071a1 100644
--- a/hostapd/iapp.c
+++ b/hostapd/iapp.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11F-2003 Inter-Access Point Protocol (IAPP)
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/iapp.h b/hostapd/iapp.h
index d9c1843..86de592 100644
--- a/hostapd/iapp.h
+++ b/hostapd/iapp.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11F-2003 Inter-Access Point Protocol (IAPP)
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 5eb830e..c87230c 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 Management
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h
index 3a432f2..e609943 100644
--- a/hostapd/ieee802_11.h
+++ b/hostapd/ieee802_11.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 Management
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c
index 5af4891..79d914a 100644
--- a/hostapd/ieee802_11_auth.c
+++ b/hostapd/ieee802_11_auth.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 authentication (ACL)
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11_auth.h b/hostapd/ieee802_11_auth.h
index 8dc0857..0eed825 100644
--- a/hostapd/ieee802_11_auth.h
+++ b/hostapd/ieee802_11_auth.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 authentication (ACL)
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11h.c b/hostapd/ieee802_11h.c
index e1777bc..215e377 100644
--- a/hostapd/ieee802_11h.c
+++ b/hostapd/ieee802_11h.c
@@ -1,7 +1,7 @@
/*
* hostapd / IEEE 802.11h
* Copyright (c) 2005-2006, Devicescape Software, Inc.
- * Copyright (c) 2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_11h.h b/hostapd/ieee802_11h.h
index 796c504..b2bd549 100644
--- a/hostapd/ieee802_11h.h
+++ b/hostapd/ieee802_11h.h
@@ -1,7 +1,7 @@
/*
* hostapd / IEEE 802.11h
* Copyright (c) 2005-2006, Devicescape Software, Inc.
- * Copyright (c) 2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index b801fbe..717e46a 100644
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.1X Authenticator
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/ieee802_1x.h b/hostapd/ieee802_1x.h
index 1840c91..3c3eaa2 100644
--- a/hostapd/ieee802_1x.h
+++ b/hostapd/ieee802_1x.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.1X Authenticator
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/milenage.c b/hostapd/milenage.c
index 6e45b58..ab8bbd5 100644
--- a/hostapd/milenage.c
+++ b/hostapd/milenage.c
@@ -1,6 +1,6 @@
/*
* 3GPP AKA - Milenage algorithm (3GPP TS 35.205, .206, .207, .208)
- * Copyright (c) 2006 <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006 <j@w1.fi>
*
* 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
diff --git a/hostapd/milenage.h b/hostapd/milenage.h
index eeeabc6..cc184f0 100644
--- a/hostapd/milenage.h
+++ b/hostapd/milenage.h
@@ -1,6 +1,6 @@
/*
* UMTS AKA - Milenage algorithm (3GPP TS 35.205, .206, .207, .208)
- * Copyright (c) 2006 <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006 <j@w1.fi>
*
* 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
diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index 21781f9..318ca86 100644
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 MLME
- * Copyright 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2003-2006, Jouni Malinen <j@w1.fi>
* Copyright 2003-2004, Instant802 Networks, Inc.
* Copyright 2005-2006, Devicescape Software, Inc.
*
diff --git a/hostapd/mlme.h b/hostapd/mlme.h
index 5b258c3..c77a939 100644
--- a/hostapd/mlme.h
+++ b/hostapd/mlme.h
@@ -1,6 +1,6 @@
/*
* hostapd / IEEE 802.11 MLME
- * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright 2003, Jouni Malinen <j@w1.fi>
* Copyright 2003-2004, Instant802 Networks, Inc.
* Copyright 2005-2006, Devicescape Software, Inc.
*
diff --git a/hostapd/nt_password_hash.c b/hostapd/nt_password_hash.c
index 1ef8f92..9df307d 100644
--- a/hostapd/nt_password_hash.c
+++ b/hostapd/nt_password_hash.c
@@ -1,6 +1,6 @@
/*
* hostapd - Plaintext password to NtPasswordHash
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/peerkey.c b/hostapd/peerkey.c
index e2d3c77..e37576c 100644
--- a/hostapd/peerkey.c
+++ b/hostapd/peerkey.c
@@ -1,6 +1,6 @@
/*
* hostapd - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c
index b4a7bd2..43a31c1 100644
--- a/hostapd/pmksa_cache.c
+++ b/hostapd/pmksa_cache.c
@@ -1,6 +1,6 @@
/*
* hostapd - PMKSA cache for IEEE 802.11i RSN
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/pmksa_cache.h b/hostapd/pmksa_cache.h
index 9963beb..dd9074e 100644
--- a/hostapd/pmksa_cache.h
+++ b/hostapd/pmksa_cache.h
@@ -1,6 +1,6 @@
/*
* hostapd - PMKSA cache for IEEE 802.11i RSN
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 61c52f9..ecf7db3 100644
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -1,6 +1,6 @@
/*
* hostapd - Authenticator for IEEE 802.11i RSN pre-authentication
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/preauth.h b/hostapd/preauth.h
index 4196442..5348bee 100644
--- a/hostapd/preauth.h
+++ b/hostapd/preauth.h
@@ -1,6 +1,6 @@
/*
* hostapd - Authenticator for IEEE 802.11i RSN pre-authentication
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/reconfig.c b/hostapd/reconfig.c
index c973d1a..4d6c43f 100644
--- a/hostapd/reconfig.c
+++ b/hostapd/reconfig.c
@@ -1,6 +1,6 @@
/*
* hostapd / Configuration reloading
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
* Copyright (c) 2002-2004, Instant802 Networks, Inc.
* Copyright (c) 2005-2006, Devicescape Software, Inc.
*
diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index c09891f..f618153 100644
--- a/hostapd/sta_info.c
+++ b/hostapd/sta_info.c
@@ -1,6 +1,6 @@
/*
* hostapd / Station table
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h
index 31e2427..1d9ab96 100644
--- a/hostapd/sta_info.h
+++ b/hostapd/sta_info.h
@@ -1,6 +1,6 @@
/*
* hostapd / Station table
- * Copyright (c) 2002-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa.c b/hostapd/wpa.c
index 4566ac0..8dd8cdd 100644
--- a/hostapd/wpa.c
+++ b/hostapd/wpa.c
@@ -1,6 +1,6 @@
/*
* hostapd - IEEE 802.11i-2004 / WPA Authenticator
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa.h b/hostapd/wpa.h
index 68e011a..ea69ea2 100644
--- a/hostapd/wpa.h
+++ b/hostapd/wpa.h
@@ -1,6 +1,6 @@
/*
* hostapd - IEEE 802.11i-2004 / WPA Authenticator
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa_auth_i.h b/hostapd/wpa_auth_i.h
index 7f5435c..5e261d5 100644
--- a/hostapd/wpa_auth_i.h
+++ b/hostapd/wpa_auth_i.h
@@ -1,6 +1,6 @@
/*
* hostapd - IEEE 802.11i-2004 / WPA Authenticator: Internal definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa_auth_ie.c b/hostapd/wpa_auth_ie.c
index bc5a359..67c7c8c 100644
--- a/hostapd/wpa_auth_ie.c
+++ b/hostapd/wpa_auth_ie.c
@@ -1,6 +1,6 @@
/*
* hostapd - WPA/RSN IE and KDE definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa_auth_ie.h b/hostapd/wpa_auth_ie.h
index 15d1456..b99fab7 100644
--- a/hostapd/wpa_auth_ie.h
+++ b/hostapd/wpa_auth_ie.h
@@ -1,6 +1,6 @@
/*
* hostapd - WPA/RSN IE and KDE definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/hostapd/wpa_ft.c b/hostapd/wpa_ft.c
index aa8b63b..5db92e0 100644
--- a/hostapd/wpa_ft.c
+++ b/hostapd/wpa_ft.c
@@ -1,6 +1,6 @@
/*
* hostapd - IEEE 802.11r - Fast BSS Transition
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/defs.h b/src/common/defs.h
index fed3298..def94b5 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Common definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 0967205..8290217 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -1,6 +1,6 @@
/*
* IEEE 802.11 Frame type definitions
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/wireless_copy.h b/src/common/wireless_copy.h
index 8208258..e01a487 100644
--- a/src/common/wireless_copy.h
+++ b/src/common/wireless_copy.h
@@ -204,7 +204,7 @@ typedef __uint8_t __u8;
* - Wireless Event capability in struct iw_range
* - Add support for relative TxPower (yick !)
*
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
* ----------
* - Add support for WPA/WPA2
* - Add extended encoding configuration (SIOCSIWENCODEEXT and
diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
index b660650..63efaf3 100644
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -1,6 +1,6 @@
/*
* WPA/RSN - Shared functions for supplicant and authenticator
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
index 2c17f69..794caa5 100644
--- a/src/common/wpa_common.h
+++ b/src/common/wpa_common.h
@@ -1,6 +1,6 @@
/*
* WPA definitions shared between hostapd and wpa_supplicant
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c
index 1dc677f..e411602 100644
--- a/src/common/wpa_ctrl.c
+++ b/src/common/wpa_ctrl.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd control interface library
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h
index 3b23734..6166fda 100644
--- a/src/common/wpa_ctrl.h
+++ b/src/common/wpa_ctrl.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd control interface library
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/aes.c b/src/crypto/aes.c
index 86a2fe0..217c0db 100644
--- a/src/crypto/aes.c
+++ b/src/crypto/aes.c
@@ -9,7 +9,7 @@
* cost of reduced throughput (quite small difference on Pentium 4,
* 10-25% when using -O1 or -O2 optimization)
*
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/aes.h b/src/crypto/aes.h
index de43d9c..6b9f414 100644
--- a/src/crypto/aes.h
+++ b/src/crypto/aes.h
@@ -1,6 +1,6 @@
/*
* AES functions
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/aes_wrap.c b/src/crypto/aes_wrap.c
index fc2f468..3f44106 100644
--- a/src/crypto/aes_wrap.c
+++ b/src/crypto/aes_wrap.c
@@ -7,7 +7,7 @@
* - AES-128 EAX mode encryption/decryption
* - AES-128 CBC
*
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/aes_wrap.h b/src/crypto/aes_wrap.h
index cb1a539..1bc6971 100644
--- a/src/crypto/aes_wrap.h
+++ b/src/crypto/aes_wrap.h
@@ -7,7 +7,7 @@
* - AES-128 EAX mode encryption/decryption
* - AES-128 CBC
*
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 4a1abac..00b13b9 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / wrapper functions for crypto libraries
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_cryptoapi.c b/src/crypto/crypto_cryptoapi.c
index c7a8cca..bb05730 100644
--- a/src/crypto/crypto_cryptoapi.c
+++ b/src/crypto/crypto_cryptoapi.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Crypto wrapper for Microsoft CryptoAPI
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_gnutls.c b/src/crypto/crypto_gnutls.c
index abc3f81..4bf75f1 100644
--- a/src/crypto/crypto_gnutls.c
+++ b/src/crypto/crypto_gnutls.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / wrapper functions for libgcrypt
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_internal.c b/src/crypto/crypto_internal.c
index 6ebebe4..b5c36c8 100644
--- a/src/crypto/crypto_internal.c
+++ b/src/crypto/crypto_internal.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Crypto wrapper for internal crypto implementation
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_libtomcrypt.c b/src/crypto/crypto_libtomcrypt.c
index 03781ac..e82097f 100644
--- a/src/crypto/crypto_libtomcrypt.c
+++ b/src/crypto/crypto_libtomcrypt.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Crypto wrapper for LibTomCrypt (for internal TLSv1)
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_none.c b/src/crypto/crypto_none.c
index 22f339d..f18c2a8 100644
--- a/src/crypto/crypto_none.c
+++ b/src/crypto/crypto_none.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Empty template functions for crypto wrapper
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
index 713a432..c5edd24 100644
--- a/src/crypto/crypto_openssl.c
+++ b/src/crypto/crypto_openssl.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / wrapper functions for libcrypto
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/des.c b/src/crypto/des.c
index fd05596..103e592 100644
--- a/src/crypto/des.c
+++ b/src/crypto/des.c
@@ -2,7 +2,7 @@
* DES and 3DES-EDE ciphers
*
* Modifications to LibTomCrypt implementation:
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/md4.c b/src/crypto/md4.c
index 280219f..41c84a3 100644
--- a/src/crypto/md4.c
+++ b/src/crypto/md4.c
@@ -1,6 +1,6 @@
/*
* MD4 hash implementation
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/md5.c b/src/crypto/md5.c
index 999988e..a7db7aa 100644
--- a/src/crypto/md5.c
+++ b/src/crypto/md5.c
@@ -1,6 +1,6 @@
/*
* MD5 hash implementation and interface functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/md5.h b/src/crypto/md5.h
index 927191b..e82f396 100644
--- a/src/crypto/md5.h
+++ b/src/crypto/md5.h
@@ -1,6 +1,6 @@
/*
* MD5 hash implementation and interface functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/ms_funcs.c b/src/crypto/ms_funcs.c
index 1a89a63..b75dc83 100644
--- a/src/crypto/ms_funcs.c
+++ b/src/crypto/ms_funcs.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / shared MSCHAPV2 helper functions / RFC 2433 / RFC 2759
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/ms_funcs.h b/src/crypto/ms_funcs.h
index 3c54c79..8067c09 100644
--- a/src/crypto/ms_funcs.h
+++ b/src/crypto/ms_funcs.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / shared MSCHAPV2 helper functions / RFC 2433 / RFC 2759
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/rc4.c b/src/crypto/rc4.c
index 60135f4..8480cc5 100644
--- a/src/crypto/rc4.c
+++ b/src/crypto/rc4.c
@@ -1,6 +1,6 @@
/*
* RC4 stream cipher
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/rc4.h b/src/crypto/rc4.h
index 3873240..01f1383 100644
--- a/src/crypto/rc4.h
+++ b/src/crypto/rc4.h
@@ -1,6 +1,6 @@
/*
* RC4 stream cipher
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/sha1.c b/src/crypto/sha1.c
index cc1c915..6293865 100644
--- a/src/crypto/sha1.c
+++ b/src/crypto/sha1.c
@@ -1,6 +1,6 @@
/*
* SHA1 hash implementation and interface functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
@@ -517,11 +517,11 @@ Modified to run on Compaq Alpha hardware.
-----------------
Modified 4/01
-By Jouni Malinen <jkmaline@cc.hut.fi>
+By Jouni Malinen <j@w1.fi>
Minor changes to match the coding style used in Dynamics.
Modified September 24, 2004
-By Jouni Malinen <jkmaline@cc.hut.fi>
+By Jouni Malinen <j@w1.fi>
Fixed alignment issue in SHA1Transform when SHA1HANDSOFF is defined.
*/
diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h
index 03ef8c7..97affa1 100644
--- a/src/crypto/sha1.h
+++ b/src/crypto/sha1.h
@@ -1,6 +1,6 @@
/*
* SHA1 hash implementation and interface functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/sha256.c b/src/crypto/sha256.c
index f747e11..7e0250e 100644
--- a/src/crypto/sha256.c
+++ b/src/crypto/sha256.c
@@ -1,6 +1,6 @@
/*
* SHA-256 hash implementation and interface functions
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h
index d869443..dc597f0 100644
--- a/src/crypto/sha256.h
+++ b/src/crypto/sha256.h
@@ -1,6 +1,6 @@
/*
* SHA256 hash implementation and interface functions
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls.h b/src/crypto/tls.h
index 0a14e53..30d8842 100644
--- a/src/crypto/tls.h
+++ b/src/crypto/tls.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / SSL/TLS interface definition
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls_gnutls.c b/src/crypto/tls_gnutls.c
index 9b75eaf..0789398 100644
--- a/src/crypto/tls_gnutls.c
+++ b/src/crypto/tls_gnutls.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / SSL/TLS interface functions for openssl
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls_internal.c b/src/crypto/tls_internal.c
index 009a754..30d3e0d 100644
--- a/src/crypto/tls_internal.c
+++ b/src/crypto/tls_internal.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / TLS interface functions and an internal TLS implementation
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls_none.c b/src/crypto/tls_none.c
index 7d08c92..ad08d50 100644
--- a/src/crypto/tls_none.c
+++ b/src/crypto/tls_none.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / SSL/TLS interface functions for no TLS case
- * Copyright (c) 2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index fdbbb3b..b9cecea 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / SSL/TLS interface functions for openssl
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/crypto/tls_schannel.c b/src/crypto/tls_schannel.c
index 976ee28..4ecfae0 100644
--- a/src/crypto/tls_schannel.c
+++ b/src/crypto/tls_schannel.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / SSL/TLS interface functions for Microsoft Schannel
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index f23b767..1246014 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver interface definition
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_atmel.c b/src/drivers/driver_atmel.c
index 588565e..5a3b302 100644
--- a/src/drivers/driver_atmel.c
+++ b/src/drivers/driver_atmel.c
@@ -1,7 +1,7 @@
/*
* WPA Supplicant - Driver interaction with Atmel Wireless LAN drivers
* Copyright (c) 2000-2005, ATMEL Corporation
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_broadcom.c b/src/drivers/driver_broadcom.c
index 743787f..f6ddf40 100644
--- a/src/drivers/driver_broadcom.c
+++ b/src/drivers/driver_broadcom.c
@@ -1,7 +1,7 @@
/*
* WPA Supplicant - driver interaction with Broadcom wl.o driver
* Copyright (c) 2004, Nikki Chumkov <nikki@gattaca.ru>
- * Copyright (c) 2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index ec60994..9a5e02b 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver interaction with Linux Host AP driver
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_hostap.h b/src/drivers/driver_hostap.h
index 7679105..a83322f 100644
--- a/src/drivers/driver_hostap.h
+++ b/src/drivers/driver_hostap.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver interaction with Linux Host AP driver
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_ipw.c b/src/drivers/driver_ipw.c
index df8c25c..8ba4e43 100644
--- a/src/drivers/driver_ipw.c
+++ b/src/drivers/driver_ipw.c
@@ -2,7 +2,7 @@
* WPA Supplicant - driver interaction with Linux ipw2100/2200 drivers
* Copyright (c) 2005 Zhu Yi <yi.zhu@intel.com>
* Copyright (c) 2004 Lubomir Gelo <lgelo@cnc.sk>
- * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2004, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 7f7a6d8..480b084 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -1,7 +1,7 @@
/*
* WPA Supplicant - driver interaction with MADWIFI 802.11 driver
* Copyright (c) 2004, Sam Leffler <sam@errno.com>
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index e7d4c4e..0557a01 100644
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Windows/NDIS driver interface
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_ndis.h b/src/drivers/driver_ndis.h
index 55f4ad2..0fae429 100644
--- a/src/drivers/driver_ndis.h
+++ b/src/drivers/driver_ndis.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Windows/NDIS driver interface
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_ndis_.c b/src/drivers/driver_ndis_.c
index e15d9ef..4bee9aa 100644
--- a/src/drivers/driver_ndis_.c
+++ b/src/drivers/driver_ndis_.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Windows/NDIS driver interface - event processing
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_ndiswrapper.c b/src/drivers/driver_ndiswrapper.c
index 886bbcc..baf9327 100644
--- a/src/drivers/driver_ndiswrapper.c
+++ b/src/drivers/driver_ndiswrapper.c
@@ -1,7 +1,7 @@
/*
* WPA Supplicant - driver interaction with Linux ndiswrapper
* Copyright (c) 2004-2006, Giridhar Pemmasani <giri@lmc.cs.sunysb.edu>
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_prism54.c b/src/drivers/driver_prism54.c
index 7116e26..36b1c54 100644
--- a/src/drivers/driver_prism54.c
+++ b/src/drivers/driver_prism54.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver interaction with Linux Prism54.org driver
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004, Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 254fc82..651de57 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - testing driver interface
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index dbfad8e..52909e0 100644
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver interaction with generic Linux Wireless Extensions
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_wext.h b/src/drivers/driver_wext.h
index 48f9bb8..d65a544 100644
--- a/src/drivers/driver_wext.h
+++ b/src/drivers/driver_wext.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - driver_wext exported functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/driver_wired.c b/src/drivers/driver_wired.c
index 17ae749..f9967f5 100644
--- a/src/drivers/driver_wired.c
+++ b/src/drivers/driver_wired.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - wired Ethernet driver interface
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/drivers/drivers.c b/src/drivers/drivers.c
index 308e5de..d7cbbbd 100644
--- a/src/drivers/drivers.c
+++ b/src/drivers/drivers.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / driver interface list
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_common.c b/src/eap_common/eap_common.c
index dbb2cf8..c0f07ac 100644
--- a/src/eap_common/eap_common.c
+++ b/src/eap_common/eap_common.c
@@ -1,6 +1,6 @@
/*
* EAP common peer/server definitions
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_common.h b/src/eap_common/eap_common.h
index db83f14..580715a 100644
--- a/src/eap_common/eap_common.h
+++ b/src/eap_common/eap_common.h
@@ -1,6 +1,6 @@
/*
* EAP common peer/server definitions
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_defs.h b/src/eap_common/eap_defs.h
index 3bd34c2..a23b470 100644
--- a/src/eap_common/eap_defs.h
+++ b/src/eap_common/eap_defs.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: Shared EAP definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_gpsk_common.c b/src/eap_common/eap_gpsk_common.c
index 3e90358..a72b5f3 100644
--- a/src/eap_common/eap_gpsk_common.c
+++ b/src/eap_common/eap_gpsk_common.c
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-GPSK shared routines
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_gpsk_common.h b/src/eap_common/eap_gpsk_common.h
index d0d6d4f..c806b7f 100644
--- a/src/eap_common/eap_gpsk_common.h
+++ b/src/eap_common/eap_gpsk_common.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-GPSK shared routines
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_pax_common.c b/src/eap_common/eap_pax_common.c
index 58c3909..8011046 100644
--- a/src/eap_common/eap_pax_common.c
+++ b/src/eap_common/eap_pax_common.c
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-PAX shared routines
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_pax_common.h b/src/eap_common/eap_pax_common.h
index 39575e7..3249217 100644
--- a/src/eap_common/eap_pax_common.h
+++ b/src/eap_common/eap_pax_common.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-PAX shared routines
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_psk_common.c b/src/eap_common/eap_psk_common.c
index 7d0f7e5..8d896ae 100644
--- a/src/eap_common/eap_psk_common.c
+++ b/src/eap_common/eap_psk_common.c
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-PSK shared routines
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_psk_common.h b/src/eap_common/eap_psk_common.h
index 8192bb2..835cdaf 100644
--- a/src/eap_common/eap_psk_common.h
+++ b/src/eap_common/eap_psk_common.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-PSK shared routines
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_sake_common.c b/src/eap_common/eap_sake_common.c
index f94a79c..4b5476f 100644
--- a/src/eap_common/eap_sake_common.c
+++ b/src/eap_common/eap_sake_common.c
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-SAKE shared routines
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_sake_common.h b/src/eap_common/eap_sake_common.h
index 2bd5e07..e2297c4 100644
--- a/src/eap_common/eap_sake_common.h
+++ b/src/eap_common/eap_sake_common.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-SAKE shared routines
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_sim_common.c b/src/eap_common/eap_sim_common.c
index e10e08d..ae1846a 100644
--- a/src/eap_common/eap_sim_common.c
+++ b/src/eap_common/eap_sim_common.c
@@ -1,6 +1,6 @@
/*
* EAP peer: EAP-SIM/AKA shared routines
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_sim_common.h b/src/eap_common/eap_sim_common.h
index aff5c96..49f3598 100644
--- a/src/eap_common/eap_sim_common.h
+++ b/src/eap_common/eap_sim_common.h
@@ -1,6 +1,6 @@
/*
* EAP peer: EAP-SIM/AKA shared routines
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_common/eap_ttls.h b/src/eap_common/eap_ttls.h
index 3778c23..f69af14 100644
--- a/src/eap_common/eap_ttls.h
+++ b/src/eap_common/eap_ttls.h
@@ -1,6 +1,6 @@
/*
* EAP server/peer: EAP-TTLS (draft-ietf-pppext-eap-ttls-03.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c
index f5ed84e..8d04a92 100644
--- a/src/eap_peer/eap.c
+++ b/src/eap_peer/eap.c
@@ -1,6 +1,6 @@
/*
* EAP peer state machines (RFC 4137)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap.h b/src/eap_peer/eap.h
index 295cf62..bbf0353 100644
--- a/src/eap_peer/eap.h
+++ b/src/eap_peer/eap.h
@@ -1,6 +1,6 @@
/*
* EAP peer state machine functions (RFC 4137)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_aka.c b/src/eap_peer/eap_aka.c
index 296bb21..92ef8c1 100644
--- a/src/eap_peer/eap_aka.c
+++ b/src/eap_peer/eap_aka.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-AKA (RFC 4187)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_fast.c b/src/eap_peer/eap_fast.c
index 6429c65..a0f4a68 100644
--- a/src/eap_peer/eap_fast.c
+++ b/src/eap_peer/eap_fast.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-FAST (draft-cam-winget-eap-fast-05.txt)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_fast_pac.c b/src/eap_peer/eap_fast_pac.c
index ccf9264..e8a1061 100644
--- a/src/eap_peer/eap_fast_pac.c
+++ b/src/eap_peer/eap_fast_pac.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-FAST PAC file processing
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_fast_pac.h b/src/eap_peer/eap_fast_pac.h
index c7906ad..2288db2 100644
--- a/src/eap_peer/eap_fast_pac.h
+++ b/src/eap_peer/eap_fast_pac.h
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-FAST PAC file processing
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_gpsk.c b/src/eap_peer/eap_gpsk.c
index 8da50bf..1b84481 100644
--- a/src/eap_peer/eap_gpsk.c
+++ b/src/eap_peer/eap_gpsk.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt)
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_gtc.c b/src/eap_peer/eap_gtc.c
index 845e140..ed4f8f3 100644
--- a/src/eap_peer/eap_gtc.c
+++ b/src/eap_peer/eap_gtc.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-GTC (RFC 3748)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_i.h b/src/eap_peer/eap_i.h
index 3b343a5..896e333 100644
--- a/src/eap_peer/eap_i.h
+++ b/src/eap_peer/eap_i.h
@@ -1,6 +1,6 @@
/*
* EAP peer state machines internal structures (RFC 4137)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_leap.c b/src/eap_peer/eap_leap.c
index 98e0780..aa6e057 100644
--- a/src/eap_peer/eap_leap.c
+++ b/src/eap_peer/eap_leap.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: LEAP
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_md5.c b/src/eap_peer/eap_md5.c
index 0478216..5dc1685 100644
--- a/src/eap_peer/eap_md5.c
+++ b/src/eap_peer/eap_md5.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-MD5 (RFC 3748 and RFC 1994)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
index fcc6615..7a7b3b3 100644
--- a/src/eap_peer/eap_methods.c
+++ b/src/eap_peer/eap_methods.c
@@ -1,6 +1,6 @@
/*
* EAP peer: Method registration
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
index 6692b45..c11bd8c 100644
--- a/src/eap_peer/eap_methods.h
+++ b/src/eap_peer/eap_methods.h
@@ -1,6 +1,6 @@
/*
* EAP peer: Method registration
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_mschapv2.c b/src/eap_peer/eap_mschapv2.c
index 500949d..d58d642 100644
--- a/src/eap_peer/eap_mschapv2.c
+++ b/src/eap_peer/eap_mschapv2.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-MSCHAPV2 (draft-kamath-pppext-eap-mschapv2-00.txt)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_otp.c b/src/eap_peer/eap_otp.c
index f52a62e..405b4a5 100644
--- a/src/eap_peer/eap_otp.c
+++ b/src/eap_peer/eap_otp.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-OTP (RFC 3748)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_pax.c b/src/eap_peer/eap_pax.c
index 820cc78..6c36ec9 100644
--- a/src/eap_peer/eap_pax.c
+++ b/src/eap_peer/eap_pax.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-PAX (RFC 4746)
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_peap.c b/src/eap_peer/eap_peap.c
index c708b16..7106cba 100644
--- a/src/eap_peer/eap_peap.c
+++ b/src/eap_peer/eap_peap.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-PEAP (draft-josefsson-pppext-eap-tls-eap-07.txt)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_psk.c b/src/eap_peer/eap_psk.c
index 8f96980..8e96df8 100644
--- a/src/eap_peer/eap_psk.c
+++ b/src/eap_peer/eap_psk.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-PSK (RFC 4764)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_sake.c b/src/eap_peer/eap_sake.c
index 88e78cf..ae42c2e 100644
--- a/src/eap_peer/eap_sake.c
+++ b/src/eap_peer/eap_sake.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-SAKE (RFC 4763)
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_sim.c b/src/eap_peer/eap_sim.c
index 09e1ea7..1f869c5 100644
--- a/src/eap_peer/eap_sim.c
+++ b/src/eap_peer/eap_sim.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-SIM (RFC 4186)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_tls.c b/src/eap_peer/eap_tls.c
index 6dbad6e..c898951 100644
--- a/src/eap_peer/eap_tls.c
+++ b/src/eap_peer/eap_tls.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-TLS (RFC 2716)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
index 6192045..991e117 100644
--- a/src/eap_peer/eap_tls_common.c
+++ b/src/eap_peer/eap_tls_common.c
@@ -1,6 +1,6 @@
/*
* EAP peer: EAP-TLS/PEAP/TTLS/FAST common functions
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_tls_common.h b/src/eap_peer/eap_tls_common.h
index d251815..6e237b8 100644
--- a/src/eap_peer/eap_tls_common.h
+++ b/src/eap_peer/eap_tls_common.h
@@ -1,6 +1,6 @@
/*
* EAP peer: EAP-TLS/PEAP/TTLS/FAST common functions
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_tlv.c b/src/eap_peer/eap_tlv.c
index dd94be7..c408955 100644
--- a/src/eap_peer/eap_tlv.c
+++ b/src/eap_peer/eap_tlv.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-TLV (draft-josefsson-pppext-eap-tls-eap-07.txt)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_tlv.h b/src/eap_peer/eap_tlv.h
index 392f44f..a48ecd7 100644
--- a/src/eap_peer/eap_tlv.h
+++ b/src/eap_peer/eap_tlv.h
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-TLV (draft-josefsson-pppext-eap-tls-eap-07.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_ttls.c b/src/eap_peer/eap_ttls.c
index cfffce4..14704ce 100644
--- a/src/eap_peer/eap_ttls.c
+++ b/src/eap_peer/eap_ttls.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: EAP-TTLS (draft-ietf-pppext-eap-ttls-03.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_peer/eap_vendor_test.c b/src/eap_peer/eap_vendor_test.c
index 620e093..86990e4 100644
--- a/src/eap_peer/eap_vendor_test.c
+++ b/src/eap_peer/eap_vendor_test.c
@@ -1,6 +1,6 @@
/*
* EAP peer method: Test method for vendor specific (expanded) EAP type
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap.c b/src/eap_server/eap.c
index 37b6dcc..4a7ba59 100644
--- a/src/eap_server/eap.c
+++ b/src/eap_server/eap.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP Standalone Authenticator state machine (RFC 4137)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap.h b/src/eap_server/eap.h
index b073f26..65bb835 100644
--- a/src/eap_server/eap.h
+++ b/src/eap_server/eap.h
@@ -1,6 +1,6 @@
/*
* hostapd / EAP Standalone Authenticator state machine (RFC 4137)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_aka.c b/src/eap_server/eap_aka.c
index 377eff5..8299207 100644
--- a/src/eap_server/eap_aka.c
+++ b/src/eap_server/eap_aka.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_gpsk.c b/src/eap_server/eap_gpsk.c
index 66198d1..45600e6 100644
--- a/src/eap_server/eap_gpsk.c
+++ b/src/eap_server/eap_gpsk.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_gtc.c b/src/eap_server/eap_gtc.c
index fb12477..bce5db5 100644
--- a/src/eap_server/eap_gtc.c
+++ b/src/eap_server/eap_gtc.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-GTC (RFC 3748)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_i.h b/src/eap_server/eap_i.h
index 9cc5c6c..c1a5a8a 100644
--- a/src/eap_server/eap_i.h
+++ b/src/eap_server/eap_i.h
@@ -1,6 +1,6 @@
/*
* hostapd / EAP Authenticator state machine internal structures (RFC 4137)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_identity.c b/src/eap_server/eap_identity.c
index 18d9e8c..7c1b2b6 100644
--- a/src/eap_server/eap_identity.c
+++ b/src/eap_server/eap_identity.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-Identity
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_md5.c b/src/eap_server/eap_md5.c
index 4e28a2d..84f2e45 100644
--- a/src/eap_server/eap_md5.c
+++ b/src/eap_server/eap_md5.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-MD5 server
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_methods.c b/src/eap_server/eap_methods.c
index 499bcc1..f8c4a4d 100644
--- a/src/eap_server/eap_methods.c
+++ b/src/eap_server/eap_methods.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP method registration
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_methods.h b/src/eap_server/eap_methods.h
index 5ee7e33..21baa04 100644
--- a/src/eap_server/eap_methods.h
+++ b/src/eap_server/eap_methods.h
@@ -1,6 +1,6 @@
/*
* hostapd / EAP method registration
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_mschapv2.c b/src/eap_server/eap_mschapv2.c
index 8ab5e57..b20d5c6 100644
--- a/src/eap_server/eap_mschapv2.c
+++ b/src/eap_server/eap_mschapv2.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-MSCHAPv2 (draft-kamath-pppext-eap-mschapv2-00.txt) server
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_pax.c b/src/eap_server/eap_pax.c
index b3fc466..f12bdb7 100644
--- a/src/eap_server/eap_pax.c
+++ b/src/eap_server/eap_pax.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-PAX (RFC 4746) server
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_peap.c b/src/eap_server/eap_peap.c
index 1a57c16..04be35e 100644
--- a/src/eap_server/eap_peap.c
+++ b/src/eap_server/eap_peap.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-PEAP (draft-josefsson-pppext-eap-tls-eap-07.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_psk.c b/src/eap_server/eap_psk.c
index a8d87d8..eaa9a50 100644
--- a/src/eap_server/eap_psk.c
+++ b/src/eap_server/eap_psk.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-PSK (RFC 4764) server
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_sake.c b/src/eap_server/eap_sake.c
index ad1e964..d37332a 100644
--- a/src/eap_server/eap_sake.c
+++ b/src/eap_server/eap_sake.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-SAKE (RFC 4763) server
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_sim.c b/src/eap_server/eap_sim.c
index 226d69f..f3dee85 100644
--- a/src/eap_server/eap_sim.c
+++ b/src/eap_server/eap_sim.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-SIM (RFC 4186)
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_sim_db.c b/src/eap_server/eap_sim_db.c
index 095d0f1..4554240 100644
--- a/src/eap_server/eap_sim_db.c
+++ b/src/eap_server/eap_sim_db.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-SIM database/authenticator gateway
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_sim_db.h b/src/eap_server/eap_sim_db.h
index 68b6e47..15b5dce 100644
--- a/src/eap_server/eap_sim_db.h
+++ b/src/eap_server/eap_sim_db.h
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-SIM database/authenticator gateway
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_tls.c b/src/eap_server/eap_tls.c
index 903342a..893f744 100644
--- a/src/eap_server/eap_tls.c
+++ b/src/eap_server/eap_tls.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-TLS (RFC 2716)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_tls_common.c b/src/eap_server/eap_tls_common.c
index 8236c95..ebd6afa 100644
--- a/src/eap_server/eap_tls_common.c
+++ b/src/eap_server/eap_tls_common.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-TLS/PEAP/TTLS common functions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_tls_common.h b/src/eap_server/eap_tls_common.h
index b854376..36f76e7 100644
--- a/src/eap_server/eap_tls_common.h
+++ b/src/eap_server/eap_tls_common.h
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-TLS/PEAP/TTLS common functions
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_tlv.c b/src/eap_server/eap_tlv.c
index 63e5fb9..0d3e507 100644
--- a/src/eap_server/eap_tlv.c
+++ b/src/eap_server/eap_tlv.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-TLV (draft-josefsson-pppext-eap-tls-eap-07.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_ttls.c b/src/eap_server/eap_ttls.c
index 58a70bf..dd06222 100644
--- a/src/eap_server/eap_ttls.c
+++ b/src/eap_server/eap_ttls.c
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-TTLS (draft-ietf-pppext-eap-ttls-05.txt)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/eap_server/eap_vendor_test.c b/src/eap_server/eap_vendor_test.c
index 8f6e628..eb653e5 100644
--- a/src/eap_server/eap_vendor_test.c
+++ b/src/eap_server/eap_vendor_test.c
@@ -1,6 +1,6 @@
/*
* hostapd / Test method for vendor specific (expanded) EAP type
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet.h b/src/l2_packet/l2_packet.h
index e69df28..b4824c5 100644
--- a/src/l2_packet/l2_packet.h
+++ b/src/l2_packet/l2_packet.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet interface definition
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet_freebsd.c b/src/l2_packet/l2_packet_freebsd.c
index d21de4f..28518bc 100644
--- a/src/l2_packet/l2_packet_freebsd.c
+++ b/src/l2_packet/l2_packet_freebsd.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling with FreeBSD
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
* Copyright (c) 2005, Sam Leffler <sam@errno.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/l2_packet/l2_packet_linux.c b/src/l2_packet/l2_packet_linux.c
index fee9de9..df4d910 100644
--- a/src/l2_packet/l2_packet_linux.c
+++ b/src/l2_packet/l2_packet_linux.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling with Linux packet sockets
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet_ndis.c b/src/l2_packet/l2_packet_ndis.c
index a071c84..7de5880 100644
--- a/src/l2_packet/l2_packet_ndis.c
+++ b/src/l2_packet/l2_packet_ndis.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling with Microsoft NDISUIO
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet_none.c b/src/l2_packet/l2_packet_none.c
index 7818b1d..5e3f6e9 100644
--- a/src/l2_packet/l2_packet_none.c
+++ b/src/l2_packet/l2_packet_none.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling example with dummy functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet_pcap.c b/src/l2_packet/l2_packet_pcap.c
index d9b47ec..16770da 100644
--- a/src/l2_packet/l2_packet_pcap.c
+++ b/src/l2_packet/l2_packet_pcap.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling with libpcap/libdnet and WinPcap
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/l2_packet/l2_packet_winpcap.c b/src/l2_packet/l2_packet_winpcap.c
index 7057dd7..2879da7 100644
--- a/src/l2_packet/l2_packet_winpcap.c
+++ b/src/l2_packet/l2_packet_winpcap.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Layer2 packet handling with WinPcap RX thread
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius.c b/src/radius/radius.c
index 2d8a0d8..cbd2aad 100644
--- a/src/radius/radius.c
+++ b/src/radius/radius.c
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS message processing
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius.h b/src/radius/radius.h
index e254af9..79bc6e4 100644
--- a/src/radius/radius.h
+++ b/src/radius/radius.h
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS message processing
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c
index 276eb6d..b3663dc 100644
--- a/src/radius/radius_client.c
+++ b/src/radius/radius_client.c
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS client
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius_client.h b/src/radius/radius_client.h
index 6d05cde..fd5088b 100644
--- a/src/radius/radius_client.h
+++ b/src/radius/radius_client.h
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS client
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius_server.c b/src/radius/radius_server.c
index deb346f..f68ba18 100644
--- a/src/radius/radius_server.c
+++ b/src/radius/radius_server.c
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS authentication server
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/radius/radius_server.h b/src/radius/radius_server.h
index 10b7228..2b50bad 100644
--- a/src/radius/radius_server.h
+++ b/src/radius/radius_server.h
@@ -1,6 +1,6 @@
/*
* hostapd / RADIUS authentication server
- * Copyright (c) 2005-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/asn1.c b/src/tls/asn1.c
index 2810971..ff3db7d 100644
--- a/src/tls/asn1.c
+++ b/src/tls/asn1.c
@@ -1,6 +1,6 @@
/*
* ASN.1 DER parsing
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/asn1.h b/src/tls/asn1.h
index 38fff39..c02ada8 100644
--- a/src/tls/asn1.h
+++ b/src/tls/asn1.h
@@ -1,6 +1,6 @@
/*
* ASN.1 DER parsing
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/asn1_test.c b/src/tls/asn1_test.c
index 7db2a59..a5c7753 100644
--- a/src/tls/asn1_test.c
+++ b/src/tls/asn1_test.c
@@ -1,6 +1,6 @@
/*
* Testing tool for ASN.1/X.509v3 routines
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/bignum.c b/src/tls/bignum.c
index 509e63f..4c304c2 100644
--- a/src/tls/bignum.c
+++ b/src/tls/bignum.c
@@ -1,6 +1,6 @@
/*
* Big number math
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/bignum.h b/src/tls/bignum.h
index fbea510..f25e267 100644
--- a/src/tls/bignum.h
+++ b/src/tls/bignum.h
@@ -1,6 +1,6 @@
/*
* Big number math
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/rsa.c b/src/tls/rsa.c
index 617336d..bfc0d52 100644
--- a/src/tls/rsa.c
+++ b/src/tls/rsa.c
@@ -1,6 +1,6 @@
/*
* RSA
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/rsa.h b/src/tls/rsa.h
index 9929a06..ac50dfd 100644
--- a/src/tls/rsa.h
+++ b/src/tls/rsa.h
@@ -1,6 +1,6 @@
/*
* RSA
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/tlsv1_client.c b/src/tls/tlsv1_client.c
index a499329..3247cf7 100644
--- a/src/tls/tlsv1_client.c
+++ b/src/tls/tlsv1_client.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant: TLSv1 client (RFC 2246)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/tlsv1_client.h b/src/tls/tlsv1_client.h
index 57de4a6..1002e43 100644
--- a/src/tls/tlsv1_client.h
+++ b/src/tls/tlsv1_client.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant: TLSv1 client (RFC 2246)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/tlsv1_common.c b/src/tls/tlsv1_common.c
index 99a4a10..8432398 100644
--- a/src/tls/tlsv1_common.c
+++ b/src/tls/tlsv1_common.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd: TLSv1 common routines
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/tlsv1_common.h b/src/tls/tlsv1_common.h
index a282eca..9ecabfa 100644
--- a/src/tls/tlsv1_common.h
+++ b/src/tls/tlsv1_common.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd: TLSv1 common definitions
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
index 2fd7cae..1283fff 100644
--- a/src/tls/x509v3.c
+++ b/src/tls/x509v3.c
@@ -1,6 +1,6 @@
/*
* X.509v3 certificate parsing and processing (RFC 3280 profile)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/tls/x509v3.h b/src/tls/x509v3.h
index 92e6717..a52bcf8 100644
--- a/src/tls/x509v3.h
+++ b/src/tls/x509v3.h
@@ -1,6 +1,6 @@
/*
* X.509v3 certificate parsing and processing
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/base64.c b/src/utils/base64.c
index f9eb485..3407949 100644
--- a/src/utils/base64.c
+++ b/src/utils/base64.c
@@ -1,6 +1,6 @@
/*
* Base64 encoding/decoding (RFC1341)
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/base64.h b/src/utils/base64.h
index 7043328..73312dd 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -1,6 +1,6 @@
/*
* Base64 encoding/decoding (RFC1341)
- * Copyright (c) 2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/build_config.h b/src/utils/build_config.h
index d715337..58bcda8 100644
--- a/src/utils/build_config.h
+++ b/src/utils/build_config.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd - Build time configuration defines
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/common.c b/src/utils/common.c
index 49dc0bf..1ee88f4 100644
--- a/src/utils/common.c
+++ b/src/utils/common.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / common helper functions, etc.
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/common.h b/src/utils/common.h
index 54d493e..600d610 100644
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / common helper functions, etc.
- * Copyright (c) 2002-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/eloop.c b/src/utils/eloop.c
index 3f110bd..021c516 100644
--- a/src/utils/eloop.c
+++ b/src/utils/eloop.c
@@ -1,6 +1,6 @@
/*
* Event loop based on select() loop
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/eloop.h b/src/utils/eloop.h
index bddc4e3..4dd2871 100644
--- a/src/utils/eloop.h
+++ b/src/utils/eloop.h
@@ -1,6 +1,6 @@
/*
* Event loop
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/eloop_none.c b/src/utils/eloop_none.c
index 9fc1240..6943109 100644
--- a/src/utils/eloop_none.c
+++ b/src/utils/eloop_none.c
@@ -1,6 +1,6 @@
/*
* Event loop - empty template (basic structure, but no OS specific operations)
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/eloop_win.c b/src/utils/eloop_win.c
index 5116e7e..73f0eaf 100644
--- a/src/utils/eloop_win.c
+++ b/src/utils/eloop_win.c
@@ -1,6 +1,6 @@
/*
* Event loop based on Windows events and WaitForMultipleObjects
- * Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/includes.h b/src/utils/includes.h
index b887e62..84308c3 100644
--- a/src/utils/includes.h
+++ b/src/utils/includes.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd - Default include files
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/ip_addr.c b/src/utils/ip_addr.c
index f6606fe..d40a871 100644
--- a/src/utils/ip_addr.c
+++ b/src/utils/ip_addr.c
@@ -1,6 +1,6 @@
/*
* IP address processing
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/ip_addr.h b/src/utils/ip_addr.h
index 3cbe648..192049a 100644
--- a/src/utils/ip_addr.h
+++ b/src/utils/ip_addr.h
@@ -1,6 +1,6 @@
/*
* IP address processing
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/os.h b/src/utils/os.h
index 3dfb23a..54450d6 100644
--- a/src/utils/os.h
+++ b/src/utils/os.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / OS specific functions
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/os_internal.c b/src/utils/os_internal.c
index 6616e22..7b74bbf 100644
--- a/src/utils/os_internal.c
+++ b/src/utils/os_internal.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / Internal implementation of OS specific functions
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/os_none.c b/src/utils/os_none.c
index 2614603..bab8f17 100644
--- a/src/utils/os_none.c
+++ b/src/utils/os_none.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / Empty OS specific functions
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/os_unix.c b/src/utils/os_unix.c
index c0f33c1..f666b69 100644
--- a/src/utils/os_unix.c
+++ b/src/utils/os_unix.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / OS specific functions for UNIX/POSIX systems
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/os_win32.c b/src/utils/os_win32.c
index 1f045a0..f4ca5a6 100644
--- a/src/utils/os_win32.c
+++ b/src/utils/os_win32.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd / OS specific functions for Win32 systems
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/src/utils/state_machine.h b/src/utils/state_machine.h
index 786aedd..62766bf 100644
--- a/src/utils/state_machine.h
+++ b/src/utils/state_machine.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant/hostapd - State machine definitions
- * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/testing/wireless/wireless-18.h b/testing/wireless/wireless-18.h
index c3ec197..be55240 100644
--- a/testing/wireless/wireless-18.h
+++ b/testing/wireless/wireless-18.h
@@ -183,7 +183,7 @@
* - Wireless Event capability in struct iw_range
* - Add support for relative TxPower (yick !)
*
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
* ----------
* - Add support for WPA/WPA2
* - Add extended encoding configuration (SIOCSIWENCODEEXT and
diff --git a/testing/wireless/wireless-19.h b/testing/wireless/wireless-19.h
index a555a0f..5b6ea55 100644
--- a/testing/wireless/wireless-19.h
+++ b/testing/wireless/wireless-19.h
@@ -181,7 +181,7 @@
* - Wireless Event capability in struct iw_range
* - Add support for relative TxPower (yick !)
*
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
* ----------
* - Add support for WPA/WPA2
* - Add extended encoding configuration (SIOCSIWENCODEEXT and
diff --git a/wpa_supplicant/README b/wpa_supplicant/README
index 1644d1a..98843f8 100644
--- a/wpa_supplicant/README
+++ b/wpa_supplicant/README
@@ -1,7 +1,7 @@
WPA Supplicant
==============
-Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi> and
+Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi> and
contributors
All Rights Reserved.
diff --git a/wpa_supplicant/README-Windows.txt b/wpa_supplicant/README-Windows.txt
index ad458cd..2155b0d 100644
--- a/wpa_supplicant/README-Windows.txt
+++ b/wpa_supplicant/README-Windows.txt
@@ -1,7 +1,7 @@
wpa_supplicant for Windows
==========================
-Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi> and
+Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi> and
contributors
All Rights Reserved.
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 82d4ae7..17f8b6f 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Configuration parser and common functions
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
index 2281e55..3852f92 100644
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Configuration file structures
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 8f97d43..ec69e8c 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Configuration backend: text file
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c
index 5f258cc..2e9ccc0 100644
--- a/wpa_supplicant/config_none.c
+++ b/wpa_supplicant/config_none.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Configuration backend: empty starting point
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index ffa2657..3660f16 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Network configuration structures
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/config_winreg.c b/wpa_supplicant/config_winreg.c
index 2591e48..584d088 100644
--- a/wpa_supplicant/config_winreg.c
+++ b/wpa_supplicant/config_winreg.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Configuration backend: Windows registry
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 2f5d3c7..30ca369 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Control interface (shared code for all backends)
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/ctrl_iface.h b/wpa_supplicant/ctrl_iface.h
index a7718e4..051d99a 100644
--- a/wpa_supplicant/ctrl_iface.h
+++ b/wpa_supplicant/ctrl_iface.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / UNIX domain socket -based control interface
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/ctrl_iface_named_pipe.c b/wpa_supplicant/ctrl_iface_named_pipe.c
index b3f6148..5813e08 100644
--- a/wpa_supplicant/ctrl_iface_named_pipe.c
+++ b/wpa_supplicant/ctrl_iface_named_pipe.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Windows Named Pipe -based control interface
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c
index 1ee96e8..bb6f11d 100644
--- a/wpa_supplicant/ctrl_iface_udp.c
+++ b/wpa_supplicant/ctrl_iface_udp.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / UDP socket -based control interface
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index 9c39206..b4b3dee 100644
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / UNIX domain socket -based control interface
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/doc/docbook/wpa_background.sgml b/wpa_supplicant/doc/docbook/wpa_background.sgml
index dc64360..f47235b 100644
--- a/wpa_supplicant/doc/docbook/wpa_background.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_background.sgml
@@ -90,8 +90,8 @@
<refsect1>
<title>Legal</title>
- <para>wpa_supplicant is copyright (c) 2003-2005,
- Jouni Malinen <email>jkmaline@cc.hut.fi</email> and
+ <para>wpa_supplicant is copyright (c) 2003-2007,
+ Jouni Malinen <email>j@w1.fi</email> and
contributors.
All Rights Reserved.</para>
diff --git a/wpa_supplicant/doc/docbook/wpa_cli.sgml b/wpa_supplicant/doc/docbook/wpa_cli.sgml
index 2aa92ee..649fc53 100644
--- a/wpa_supplicant/doc/docbook/wpa_cli.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_cli.sgml
@@ -327,8 +327,8 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
</refsect1>
<refsect1>
<title>Legal</title>
- <para>wpa_supplicant is copyright (c) 2003-2005,
- Jouni Malinen <email>jkmaline@cc.hut.fi</email> and
+ <para>wpa_supplicant is copyright (c) 2003-2007,
+ Jouni Malinen <email>j@w1.fi</email> and
contributors.
All Rights Reserved.</para>
diff --git a/wpa_supplicant/doc/docbook/wpa_passphrase.sgml b/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
index 244ec86..402ea09 100644
--- a/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
@@ -62,8 +62,8 @@
</refsect1>
<refsect1>
<title>Legal</title>
- <para>wpa_supplicant is copyright (c) 2003-2005,
- Jouni Malinen <email>jkmaline@cc.hut.fi</email> and
+ <para>wpa_supplicant is copyright (c) 2003-2007,
+ Jouni Malinen <email>j@w1.fi</email> and
contributors.
All Rights Reserved.</para>
diff --git a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
index 4ffc9a2..b67cc3f 100644
--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
@@ -792,8 +792,8 @@ fi
</refsect1>
<refsect1>
<title>Legal</title>
- <para>wpa_supplicant is copyright (c) 2003-2005,
- Jouni Malinen <email>jkmaline@cc.hut.fi</email> and
+ <para>wpa_supplicant is copyright (c) 2003-2007,
+ Jouni Malinen <email>j@w1.fi</email> and
contributors.
All Rights Reserved.</para>
diff --git a/wpa_supplicant/doc/kerneldoc2doxygen.pl b/wpa_supplicant/doc/kerneldoc2doxygen.pl
index daec483..68835a1 100755
--- a/wpa_supplicant/doc/kerneldoc2doxygen.pl
+++ b/wpa_supplicant/doc/kerneldoc2doxygen.pl
@@ -20,7 +20,7 @@
#
##########################################################################
# Copyright (C) 2003 Jonathan Foster <jon@jon-foster.co.uk>
-# Copyright (C) 2005 Jouni Malinen <jkmaline@cc.hut.fi>
+# Copyright (C) 2005 Jouni Malinen <j@w1.fi>
# (modified for kerneldoc format used in wpa_supplicant)
#
# This program is free software; you can redistribute it and/or modify
diff --git a/wpa_supplicant/doc/mainpage.doxygen b/wpa_supplicant/doc/mainpage.doxygen
index 56882f4..6e58af8 100644
--- a/wpa_supplicant/doc/mainpage.doxygen
+++ b/wpa_supplicant/doc/mainpage.doxygen
@@ -13,7 +13,7 @@ give enough information for other developers to understand how
%wpa_supplicant has been implemented, how it can be modified, how new
drivers can be supported, and how %wpa_supplicant can be ported to
other operating systems. If any information is missing, feel free to
-contact Jouni Malinen <jkmaline@cc.hut.fi> for more
+contact Jouni Malinen <j@w1.fi> for more
information. Contributions as patch files are also very welcome at the
same address. Please note that %wpa_supplicant is licensed under dual
license, GPLv2 or BSD at user's choice. All contributions to
diff --git a/wpa_supplicant/eap_testing.txt b/wpa_supplicant/eap_testing.txt
index 21987aa..49add03 100644
--- a/wpa_supplicant/eap_testing.txt
+++ b/wpa_supplicant/eap_testing.txt
@@ -25,7 +25,7 @@ certificates, and private keys for testing use. Other alternative
would be to get an evaluation version of the server so that I can
install it on my own test setup. If you are interested in providing
either server access or evaluation version, please contact me
-(jkmaline@cc.hut.fi).
+(j@w1.fi).
Test matrix
diff --git a/wpa_supplicant/eapol_sm.c b/wpa_supplicant/eapol_sm.c
index ea67a92..30622da 100644
--- a/wpa_supplicant/eapol_sm.c
+++ b/wpa_supplicant/eapol_sm.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / EAPOL state machines
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/eapol_sm.h b/wpa_supplicant/eapol_sm.h
index ff34a83..927bfcb 100644
--- a/wpa_supplicant/eapol_sm.h
+++ b/wpa_supplicant/eapol_sm.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / EAPOL state machines
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c
index fa2ea21..bda85ae 100644
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - test code
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 8afed44..61ef873 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Driver event processing
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 77e6e1c..ee04a28 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / main() function for UNIX like OSes and MinGW
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/main_none.c b/wpa_supplicant/main_none.c
index cfb936a..993338a 100644
--- a/wpa_supplicant/main_none.c
+++ b/wpa_supplicant/main_none.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / Example program entrypoint
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/main_winmain.c b/wpa_supplicant/main_winmain.c
index cf7db19..95923c2 100644
--- a/wpa_supplicant/main_winmain.c
+++ b/wpa_supplicant/main_winmain.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / WinMain() function for Windows-based applications
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/main_winsvc.c b/wpa_supplicant/main_winsvc.c
index ebe656c..05b8160 100644
--- a/wpa_supplicant/main_winsvc.c
+++ b/wpa_supplicant/main_winsvc.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / main() function for Win32 service
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c
index 5ad7ef7..591ef01 100644
--- a/wpa_supplicant/mlme.c
+++ b/wpa_supplicant/mlme.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Client mode MLME
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004, Instant802 Networks, Inc.
* Copyright (c) 2005-2006, Devicescape Software, Inc.
*
diff --git a/wpa_supplicant/mlme.h b/wpa_supplicant/mlme.h
index 74246b0..61738f6 100644
--- a/wpa_supplicant/mlme.h
+++ b/wpa_supplicant/mlme.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - Client mode MLME
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004, Instant802 Networks, Inc.
* Copyright (c) 2005-2006, Devicescape Software, Inc.
*
diff --git a/wpa_supplicant/ndis_events.c b/wpa_supplicant/ndis_events.c
index 5c36546..ace041a 100644
--- a/wpa_supplicant/ndis_events.c
+++ b/wpa_supplicant/ndis_events.c
@@ -1,6 +1,6 @@
/*
* ndis_events - Receive NdisMIndicateStatus() events using WMI
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/pcsc_funcs.c b/wpa_supplicant/pcsc_funcs.c
index 3cb9745..cef8653 100644
--- a/wpa_supplicant/pcsc_funcs.c
+++ b/wpa_supplicant/pcsc_funcs.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / PC/SC smartcard interface for USIM, GSM SIM
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/pcsc_funcs.h b/wpa_supplicant/pcsc_funcs.h
index 68435a9..543f7c5 100644
--- a/wpa_supplicant/pcsc_funcs.h
+++ b/wpa_supplicant/pcsc_funcs.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant / PC/SC smartcard interface for USIM, GSM SIM
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/peerkey.c b/wpa_supplicant/peerkey.c
index 26753ca..0087b4d 100644
--- a/wpa_supplicant/peerkey.c
+++ b/wpa_supplicant/peerkey.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/peerkey.h b/wpa_supplicant/peerkey.h
index 810b34a..f69c68f 100644
--- a/wpa_supplicant/peerkey.h
+++ b/wpa_supplicant/peerkey.h
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/pmksa_cache.c b/wpa_supplicant/pmksa_cache.c
index d7e7e67..060b57f 100644
--- a/wpa_supplicant/pmksa_cache.c
+++ b/wpa_supplicant/pmksa_cache.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - RSN PMKSA cache
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/pmksa_cache.h b/wpa_supplicant/pmksa_cache.h
index 835b732..bf3b4d2 100644
--- a/wpa_supplicant/pmksa_cache.h
+++ b/wpa_supplicant/pmksa_cache.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - WPA2/RSN PMKSA cache functions
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/preauth.c b/wpa_supplicant/preauth.c
index fa99a84..4ff52ea 100644
--- a/wpa_supplicant/preauth.c
+++ b/wpa_supplicant/preauth.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - RSN pre-authentication
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/preauth.h b/wpa_supplicant/preauth.h
index 1d22471..07e3e00 100644
--- a/wpa_supplicant/preauth.h
+++ b/wpa_supplicant/preauth.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - WPA2/RSN pre-authentication functions
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c
index cc3f0bc..af0cd43 100644
--- a/wpa_supplicant/preauth_test.c
+++ b/wpa_supplicant/preauth_test.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - test code for pre-authentication
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/priv_netlink.h b/wpa_supplicant/priv_netlink.h
index 93e36fe..2a31e25 100644
--- a/wpa_supplicant/priv_netlink.h
+++ b/wpa_supplicant/priv_netlink.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - Private copy of Linux netlink/rtnetlink definitions.
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_aes.c b/wpa_supplicant/tests/test_aes.c
index 881a1da..87571dd 100644
--- a/wpa_supplicant/tests/test_aes.c
+++ b/wpa_supplicant/tests/test_aes.c
@@ -1,6 +1,6 @@
/*
* Test program for AES
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_eap_sim_common.c b/wpa_supplicant/tests/test_eap_sim_common.c
index 04fc256..ee3eee4 100644
--- a/wpa_supplicant/tests/test_eap_sim_common.c
+++ b/wpa_supplicant/tests/test_eap_sim_common.c
@@ -1,6 +1,6 @@
/*
* Test program for EAP-SIM PRF
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_md4.c b/wpa_supplicant/tests/test_md4.c
index 4f1ed4d..e92e9a5 100644
--- a/wpa_supplicant/tests/test_md4.c
+++ b/wpa_supplicant/tests/test_md4.c
@@ -1,6 +1,6 @@
/*
* Test program for MD4 (test vectors from RFC 1320)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_md5.c b/wpa_supplicant/tests/test_md5.c
index 0eb40c0..d8fb41e 100644
--- a/wpa_supplicant/tests/test_md5.c
+++ b/wpa_supplicant/tests/test_md5.c
@@ -1,6 +1,6 @@
/*
* Test program for MD5 (test vectors from RFC 1321)
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_ms_funcs.c b/wpa_supplicant/tests/test_ms_funcs.c
index dd2a7bb..09b53c4 100644
--- a/wpa_supplicant/tests/test_ms_funcs.c
+++ b/wpa_supplicant/tests/test_ms_funcs.c
@@ -1,6 +1,6 @@
/*
* Test program for ms_funcs
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_sha1.c b/wpa_supplicant/tests/test_sha1.c
index d260293..a34e3bf 100644
--- a/wpa_supplicant/tests/test_sha1.c
+++ b/wpa_supplicant/tests/test_sha1.c
@@ -1,6 +1,6 @@
/*
* Test program for SHA1 and MD5
- * Copyright (c) 2003-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_sha256.c b/wpa_supplicant/tests/test_sha256.c
index 67667a2..161533e 100644
--- a/wpa_supplicant/tests/test_sha256.c
+++ b/wpa_supplicant/tests/test_sha256.c
@@ -1,6 +1,6 @@
/*
* Test program for SHA256
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c
index fc822d3..e5cc664 100644
--- a/wpa_supplicant/tests/test_wpa.c
+++ b/wpa_supplicant/tests/test_wpa.c
@@ -1,6 +1,6 @@
/*
* Test program for combined WPA authenticator/supplicant
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/tests/test_x509v3.c b/wpa_supplicant/tests/test_x509v3.c
index 4040961..aa98ece 100644
--- a/wpa_supplicant/tests/test_x509v3.c
+++ b/wpa_supplicant/tests/test_x509v3.c
@@ -1,6 +1,6 @@
/*
* Testing tool for X.509v3 routines
- * Copyright (c) 2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/win_if_list.c b/wpa_supplicant/win_if_list.c
index 39f3078..0e1532e 100644
--- a/wpa_supplicant/win_if_list.c
+++ b/wpa_supplicant/win_if_list.c
@@ -1,6 +1,6 @@
/*
* win_if_list - Display network interfaces with description (for Windows)
- * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa.c b/wpa_supplicant/wpa.c
index a9d1380..cd4a81f 100644
--- a/wpa_supplicant/wpa.c
+++ b/wpa_supplicant/wpa.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - WPA state machine and EAPOL-Key processing
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa.h b/wpa_supplicant/wpa.h
index a8b51d2..095cac4 100644
--- a/wpa_supplicant/wpa.h
+++ b/wpa_supplicant/wpa.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - WPA definitions
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 0f9e0ec..a0e226a 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - command line interface for wpa_supplicant daemon
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
@@ -31,7 +31,7 @@
static const char *wpa_cli_version =
"wpa_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi> and contributors";
+"Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi> and contributors";
static const char *wpa_cli_license =
diff --git a/wpa_supplicant/wpa_ft.c b/wpa_supplicant/wpa_ft.c
index 63c6503..7397e3a 100644
--- a/wpa_supplicant/wpa_ft.c
+++ b/wpa_supplicant/wpa_ft.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - IEEE 802.11r - Fast BSS Transition
- * Copyright (c) 2006-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp b/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
index 1f8f5b7..ebf3c97 100644
--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - EventHistory class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h
index 8840bb1..40dff6d 100644
--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.h
+++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - EventHistory class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp
index d84f614..eeeda39 100644
--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - Application startup
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
index be11546..ca86265 100644
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - NetworkConfig class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h
index e2b3a59..5a12d70 100644
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.h
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - NetworkConfig class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
index 6e58dde..57cf716 100644
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - ScanResults class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_supplicant/wpa_gui-qt4/scanresults.h
index f91f881..22b54c9 100644
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.h
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - ScanResults class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
index a7d1ffe..e198955 100644
--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - UserDataRequest class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
index 0957d23..2b6e837 100644
--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
+++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - UserDataRequest class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index 67a7fda..761fb75 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -1,6 +1,6 @@
/*
* wpa_gui - WpaGui class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
@@ -512,7 +512,7 @@ void WpaGui::helpAbout()
{
QMessageBox::about(this, "wpa_gui for wpa_supplicant",
"Copyright (c) 2003-2006,\n"
- "Jouni Malinen <jkmaline@cc.hut.fi>\n"
+ "Jouni Malinen <j@w1.fi>\n"
"and contributors.\n"
"\n"
"This program is free software. You can\n"
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h
index e3ee1c3..cd5c1af 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - WpaGui class
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
index 2ed50cd..65ce2e8 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpamsg.h
+++ b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
@@ -1,6 +1,6 @@
/*
* wpa_gui - WpaMsg class for storing event messages
- * Copyright (c) 2005-2006, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_gui/wpagui.ui.h b/wpa_supplicant/wpa_gui/wpagui.ui.h
index 9d938fb..9484023 100644
--- a/wpa_supplicant/wpa_gui/wpagui.ui.h
+++ b/wpa_supplicant/wpa_gui/wpagui.ui.h
@@ -467,7 +467,7 @@ void WpaGui::helpAbout()
{
QMessageBox::about(this, "wpa_gui for wpa_supplicant",
"Copyright (c) 2003-2005,\n"
- "Jouni Malinen <jkmaline@cc.hut.fi>\n"
+ "Jouni Malinen <j@w1.fi>\n"
"and contributors.\n"
"\n"
"This program is free software. You can\n"
diff --git a/wpa_supplicant/wpa_i.h b/wpa_supplicant/wpa_i.h
index 903a8b7..88b0f1e 100644
--- a/wpa_supplicant/wpa_i.h
+++ b/wpa_supplicant/wpa_i.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - Internal WPA state machine definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_ie.c b/wpa_supplicant/wpa_ie.c
index a0520ed..ea9dcf4 100644
--- a/wpa_supplicant/wpa_ie.c
+++ b/wpa_supplicant/wpa_ie.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - WPA/RSN IE and KDE processing
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_ie.h b/wpa_supplicant/wpa_ie.h
index 9cdbe18..6394a0e 100644
--- a/wpa_supplicant/wpa_ie.h
+++ b/wpa_supplicant/wpa_ie.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - WPA/RSN IE and KDE definitions
- * Copyright (c) 2004-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_passphrase.c b/wpa_supplicant/wpa_passphrase.c
index 6890244..96b0c32 100644
--- a/wpa_supplicant/wpa_passphrase.c
+++ b/wpa_supplicant/wpa_passphrase.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant - ASCII passphrase to WPA PSK tool
- * Copyright (c) 2003-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index dd30dce..861065d 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1,6 +1,6 @@
/*
* WPA Supplicant
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
@@ -39,7 +39,7 @@
const char *wpa_supplicant_version =
"wpa_supplicant v" VERSION_STR "\n"
-"Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi> and contributors";
+"Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi> and contributors";
const char *wpa_supplicant_license =
"This program is free software. You can distribute it and/or modify it\n"
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 7a430d5..a479518 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1,6 +1,6 @@
/*
* wpa_supplicant - Internal definitions
- * Copyright (c) 2003-2007, Jouni Malinen <jkmaline@cc.hut.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* 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
diff --git a/www/cvs.html b/www/cvs.html
index 5c14e04..fc75352 100644
--- a/www/cvs.html
+++ b/www/cvs.html
@@ -61,10 +61,10 @@ be used.
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Mon May 27 20:08:41 EEST 2002 -->
<!-- hhmts start -->
-Last modified: Fri Mar 2 19:21:30 PST 2007
+Last modified: Thu Mar 8 19:43:36 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/hostapd/index.html b/www/hostapd/index.html
index b922ce8..6ed5309 100644
--- a/www/hostapd/index.html
+++ b/www/hostapd/index.html
@@ -80,7 +80,7 @@ material, they cannot be used with WPA or IEEE 802.1X WEP keying.</p>
<p>
<b>hostapd</b><br>
-Copyright (c) 2002-2007, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Copyright (c) 2002-2007, Jouni Malinen &lt;j@w1.fi&gt;
and contributors.
</p>
@@ -217,7 +217,7 @@ fields.</p>
<p>
Any comments, reports on success/failure, ideas for further
-improvement, feature requests, etc. are welcome at jkmaline@cc.hut.fi.
+improvement, feature requests, etc. are welcome at j@w1.fi.
Please note, that I often receive more email than I have time to answer.
Unfortunately, some messages may not get a reply, but I'll try to go
through my mail whenever time permits.
@@ -256,10 +256,10 @@ Internet Systems Consortium (ISC).
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sun Jan 2 17:20:17 PST 2005 -->
<!-- hhmts start -->
-Last modified: Fri Mar 2 19:23:15 PST 2007
+Last modified: Thu Mar 8 19:43:12 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/index.html b/www/index.html
index 17d777b..7583e95 100644
--- a/www/index.html
+++ b/www/index.html
@@ -130,24 +130,24 @@ Copyright (c) 2001-2002, SSH Communications Security Corp and
Jouni Malinen.<br>
Copyright (c) 2002-2007, Jouni Malinen and contributors.<br>
-Author: Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Author: Jouni Malinen &lt;j@w1.fi&gt;
</p>
<p>
<b>Host AP utils</b><br>
-Copyright (c) 2002-2005, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Copyright (c) 2002-2005, Jouni Malinen &lt;j@w1.fi&gt;
and contributors.
</p>
<p>
<b>hostapd</b><br>
-Copyright (c) 2002-2007, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Copyright (c) 2002-2007, Jouni Malinen &lt;j@w1.fi&gt;
and contributors.
</p>
<p>
<b>wpa_supplicant</b><br>
-Copyright (c) 2003-2007, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Copyright (c) 2003-2007, Jouni Malinen &lt;j@w1.fi&gt;
and contributors.
</p>
@@ -260,7 +260,7 @@ version of the tools is recommended. Some features might also require latest bet
<p>
Any comments, reports on success/failure, ideas for further
-improvement, feature requests, etc. are welcome at jkmaline@cc.hut.fi.
+improvement, feature requests, etc. are welcome at j@w1.fi.
Please note, that I often receive more email than I have time to answer.
Unfortunately, some messages may not get a reply, but I'll try to go
through my mail whenever time permits.
@@ -298,10 +298,10 @@ Internet Systems Consortium (ISC).
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Mon May 27 20:08:41 EEST 2002 -->
<!-- hhmts start -->
-Last modified: Fri Mar 2 19:23:24 PST 2007
+Last modified: Thu Mar 8 19:42:25 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/links.html b/www/links.html
index cf7c205..894bbdd 100644
--- a/www/links.html
+++ b/www/links.html
@@ -11,7 +11,7 @@
<p>
Here are some miscellaneous links to pages related to Host AP mode,
driver, etc. Please send any corrections or additions to <a
-href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a> (jkmaline@cc.hut.fi).
+href="mailto:j@w1.fi">Jouni Malinen</a> (j@w1.fi).
</p>
@@ -46,10 +46,10 @@ Mini-howto on Flashing Intersil Prism Chipsets</a>
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Aug 31 12:09:59 EEST 2002 -->
<!-- hhmts start -->
-Last modified: Sun Feb 15 16:42:14 PST 2004
+Last modified: Thu Mar 8 19:44:09 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/releases.html b/www/releases.html
index a088dbb..3a056f8 100644
--- a/www/releases.html
+++ b/www/releases.html
@@ -32,10 +32,10 @@
</p>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Mon Feb 20 11:14:29 PST 2006 -->
<!-- hhmts start -->
-Last modified: Mon Feb 20 11:24:29 PST 2006
+Last modified: Thu Mar 8 19:44:22 PST 2007
<!-- hhmts end -->
</body>
</html>
diff --git a/www/wpa_supplicant/conf/auth_modes.html b/www/wpa_supplicant/conf/auth_modes.html
index d5446cb..cee7c7d 100644
--- a/www/wpa_supplicant/conf/auth_modes.html
+++ b/www/wpa_supplicant/conf/auth_modes.html
@@ -17,7 +17,7 @@ authentication modes
<p class="todo">TODO</p>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 19:53:25 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:46:58 PST 2006
diff --git a/www/wpa_supplicant/conf/configure.html b/www/wpa_supplicant/conf/configure.html
index 48c2acf..858ba7f 100644
--- a/www/wpa_supplicant/conf/configure.html
+++ b/www/wpa_supplicant/conf/configure.html
@@ -231,7 +231,7 @@ configuration file&gt;</i> command line option.
<br>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 17:07:35 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:47:30 PST 2006
diff --git a/www/wpa_supplicant/conf/eap-peap.html b/www/wpa_supplicant/conf/eap-peap.html
index a5f47c0..88717fb 100644
--- a/www/wpa_supplicant/conf/eap-peap.html
+++ b/www/wpa_supplicant/conf/eap-peap.html
@@ -18,7 +18,7 @@ EAP-PEAP
<p class="todo">TODO</p>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 19:53:25 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:46:04 PST 2006
diff --git a/www/wpa_supplicant/conf/eap-tls.html b/www/wpa_supplicant/conf/eap-tls.html
index 9209200..a0b9e4e 100644
--- a/www/wpa_supplicant/conf/eap-tls.html
+++ b/www/wpa_supplicant/conf/eap-tls.html
@@ -18,7 +18,7 @@ EAP-TLS
<p class="todo">TODO</p>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 19:53:25 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:46:48 PST 2006
diff --git a/www/wpa_supplicant/conf/eap.html b/www/wpa_supplicant/conf/eap.html
index aa37075..607c749 100644
--- a/www/wpa_supplicant/conf/eap.html
+++ b/www/wpa_supplicant/conf/eap.html
@@ -22,7 +22,7 @@ EAP
</ul>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 19:53:25 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:46:19 PST 2006
diff --git a/www/wpa_supplicant/conf/index.html b/www/wpa_supplicant/conf/index.html
index c2ede7c..fcf40ee 100644
--- a/www/wpa_supplicant/conf/index.html
+++ b/www/wpa_supplicant/conf/index.html
@@ -20,7 +20,7 @@
</ul>
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat Feb 25 19:53:25 PST 2006 -->
<!-- hhmts start -->
Last modified: Sun Feb 26 13:42:02 PST 2006
diff --git a/www/wpa_supplicant/index.html b/www/wpa_supplicant/index.html
index 6c4d68d..123a2f7 100644
--- a/www/wpa_supplicant/index.html
+++ b/www/wpa_supplicant/index.html
@@ -140,7 +140,7 @@ other drivers.</p>
<p>
<b>wpa_supplicant</b><br>
-Copyright (c) 2003-2007, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;
+Copyright (c) 2003-2007, Jouni Malinen &lt;j@w1.fi&gt;
and contributors.
</p>
@@ -312,7 +312,7 @@ fields. In addition, simpler example configurations are available for
<p>
Any comments, reports on success/failure, ideas for further
-improvement, feature requests, etc. are welcome at jkmaline@cc.hut.fi.
+improvement, feature requests, etc. are welcome at j@w1.fi.
Please note, that I often receive more email than I have time to answer.
Unfortunately, some messages may not get a reply, but I'll try to go
through my mail whenever time permits.
@@ -350,10 +350,10 @@ Internet Systems Consortium (ISC).
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sat May 22 21:41:58 PDT 2004 -->
<!-- hhmts start -->
-Last modified: Fri Mar 2 19:25:43 PST 2007
+Last modified: Thu Mar 8 19:42:52 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/wpa_supplicant/support.html b/www/wpa_supplicant/support.html
index ffbec03..f4a5541 100644
--- a/www/wpa_supplicant/support.html
+++ b/www/wpa_supplicant/support.html
@@ -31,10 +31,10 @@ certification programs.
<hr>
<div>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Tue Jan 31 20:28:20 PST 2006 -->
<!-- hhmts start -->
-Last modified: Tue Jan 31 20:28:46 PST 2006
+Last modified: Thu Mar 8 19:44:57 PST 2007
<!-- hhmts end -->
</div>
</body>
diff --git a/www/wpa_supplicant/wpa_gui.html b/www/wpa_supplicant/wpa_gui.html
index e5f2d39..f2eb001 100644
--- a/www/wpa_supplicant/wpa_gui.html
+++ b/www/wpa_supplicant/wpa_gui.html
@@ -27,10 +27,10 @@
<img src="user_input.png">
<hr>
- <address><a href="mailto:jkmaline@cc.hut.fi">Jouni Malinen</a></address>
+ <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
<!-- Created: Sun May 22 20:23:01 PDT 2005 -->
<!-- hhmts start -->
-Last modified: Sat Aug 20 21:58:44 PDT 2005
+Last modified: Thu Mar 8 19:44:46 PST 2007
<!-- hhmts end -->
</body>
</html>