flatten vendor branchvendor/wpa_supplicant/0.5.10

244 files changed, 2 insertions, 2 deletions

diff --git a/contrib/wpa_supplicant/COPYING b/COPYING
index 14f5453722a8..14f5453722a8 100644
--- a/contrib/wpa_supplicant/COPYING
+++ b/COPYING
diff --git a/contrib/wpa_supplicant/ChangeLog b/ChangeLog
index 1ba2e1c8b2e2..1ba2e1c8b2e2 100644
--- a/contrib/wpa_supplicant/ChangeLog
+++ b/ChangeLog
diff --git a/contrib/wpa_supplicant/FREEBSD-Xlist b/FREEBSD-Xlist
index d9522be08a91..f2fc14f19230 100644
--- a/contrib/wpa_supplicant/FREEBSD-Xlist
+++ b/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: vendor/wpa_supplicant/dist/contrib/wpa_supplicant/FREEBSD-Xlist 171366 2007-07-11 15:48:36Z sam $
 .cvsignore
 README-Windows.txt
 driver_atmel.c
diff --git a/contrib/wpa_supplicant/FREEBSD-upgrade b/FREEBSD-upgrade
index 88a4b1848017..94edd205d88f 100644
--- a/contrib/wpa_supplicant/FREEBSD-upgrade
+++ b/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: vendor/wpa_supplicant/dist/contrib/wpa_supplicant/FREEBSD-upgrade 171366 2007-07-11 15:48:36Z sam $
 
 WPA Supplicant
 	originals can be found at: http://hostap.epitest.fi/releases/
diff --git a/contrib/wpa_supplicant/Makefile b/Makefile
index 9bcdd83047a4..9bcdd83047a4 100644
--- a/contrib/wpa_supplicant/Makefile
+++ b/Makefile
diff --git a/contrib/wpa_supplicant/README b/README
index 0b3c5858c43e..0b3c5858c43e 100644
--- a/contrib/wpa_supplicant/README
+++ b/README
diff --git a/contrib/wpa_supplicant/aes.c b/aes.c
index 1a2459b3e013..1a2459b3e013 100644
--- a/contrib/wpa_supplicant/aes.c
+++ b/aes.c
diff --git a/contrib/wpa_supplicant/aes.h b/aes.h
index 6b9f4147afb1..6b9f4147afb1 100644
--- a/contrib/wpa_supplicant/aes.h
+++ b/aes.h
diff --git a/contrib/wpa_supplicant/aes_wrap.c b/aes_wrap.c
index 765b1ca871ad..765b1ca871ad 100644
--- a/contrib/wpa_supplicant/aes_wrap.c
+++ b/aes_wrap.c
diff --git a/contrib/wpa_supplicant/aes_wrap.h b/aes_wrap.h
index 5eb4342a5bf9..5eb4342a5bf9 100644
--- a/contrib/wpa_supplicant/aes_wrap.h
+++ b/aes_wrap.h
diff --git a/contrib/wpa_supplicant/asn1.c b/asn1.c
index 96bc1ac78a9d..96bc1ac78a9d 100644
--- a/contrib/wpa_supplicant/asn1.c
+++ b/asn1.c
diff --git a/contrib/wpa_supplicant/asn1.h b/asn1.h
index c02ada8278a2..c02ada8278a2 100644
--- a/contrib/wpa_supplicant/asn1.h
+++ b/asn1.h
diff --git a/contrib/wpa_supplicant/asn1_test.c b/asn1_test.c
index a5c77535309f..a5c77535309f 100644
--- a/contrib/wpa_supplicant/asn1_test.c
+++ b/asn1_test.c
diff --git a/contrib/wpa_supplicant/base64.c b/base64.c
index 0c33e5881b64..0c33e5881b64 100644
--- a/contrib/wpa_supplicant/base64.c
+++ b/base64.c
diff --git a/contrib/wpa_supplicant/base64.h b/base64.h
index 73312dde8f64..73312dde8f64 100644
--- a/contrib/wpa_supplicant/base64.h
+++ b/base64.h
diff --git a/contrib/wpa_supplicant/bignum.c b/bignum.c
index 4c304c2a5af5..4c304c2a5af5 100644
--- a/contrib/wpa_supplicant/bignum.c
+++ b/bignum.c
diff --git a/contrib/wpa_supplicant/bignum.h b/bignum.h
index f25e26783a0a..f25e26783a0a 100644
--- a/contrib/wpa_supplicant/bignum.h
+++ b/bignum.h
diff --git a/contrib/wpa_supplicant/build_config.h b/build_config.h
index 58bcda825345..58bcda825345 100644
--- a/contrib/wpa_supplicant/build_config.h
+++ b/build_config.h
diff --git a/contrib/wpa_supplicant/common.c b/common.c
index d0233d88f5d1..d0233d88f5d1 100644
--- a/contrib/wpa_supplicant/common.c
+++ b/common.c
diff --git a/contrib/wpa_supplicant/common.h b/common.h
index eda328af345d..eda328af345d 100644
--- a/contrib/wpa_supplicant/common.h
+++ b/common.h
diff --git a/contrib/wpa_supplicant/config.c b/config.c
index 6ea66de34eec..6ea66de34eec 100644
--- a/contrib/wpa_supplicant/config.c
+++ b/config.c
diff --git a/contrib/wpa_supplicant/config.h b/config.h
index 3852f9274e2b..3852f9274e2b 100644
--- a/contrib/wpa_supplicant/config.h
+++ b/config.h
diff --git a/contrib/wpa_supplicant/config_file.c b/config_file.c
index 757a1b8b1d6b..757a1b8b1d6b 100644
--- a/contrib/wpa_supplicant/config_file.c
+++ b/config_file.c
diff --git a/contrib/wpa_supplicant/config_none.c b/config_none.c
index 2e9ccc0a2835..2e9ccc0a2835 100644
--- a/contrib/wpa_supplicant/config_none.c
+++ b/config_none.c
diff --git a/contrib/wpa_supplicant/config_ssid.h b/config_ssid.h
index 393f7506ce39..393f7506ce39 100644
--- a/contrib/wpa_supplicant/config_ssid.h
+++ b/config_ssid.h
diff --git a/contrib/wpa_supplicant/config_types.h b/config_types.h
index ffcffa3c0cd4..ffcffa3c0cd4 100644
--- a/contrib/wpa_supplicant/config_types.h
+++ b/config_types.h
diff --git a/contrib/wpa_supplicant/config_winreg.c b/config_winreg.c
index 8a3ba53734f9..8a3ba53734f9 100644
--- a/contrib/wpa_supplicant/config_winreg.c
+++ b/config_winreg.c
diff --git a/contrib/wpa_supplicant/crypto.c b/crypto.c
index c5edd24c4b55..c5edd24c4b55 100644
--- a/contrib/wpa_supplicant/crypto.c
+++ b/crypto.c
diff --git a/contrib/wpa_supplicant/crypto.h b/crypto.h
index 00b13b91c48e..00b13b91c48e 100644
--- a/contrib/wpa_supplicant/crypto.h
+++ b/crypto.h
diff --git a/contrib/wpa_supplicant/crypto_cryptoapi.c b/crypto_cryptoapi.c
index bb0573078d24..bb0573078d24 100644
--- a/contrib/wpa_supplicant/crypto_cryptoapi.c
+++ b/crypto_cryptoapi.c
diff --git a/contrib/wpa_supplicant/crypto_gnutls.c b/crypto_gnutls.c
index 4bf75f132a00..4bf75f132a00 100644
--- a/contrib/wpa_supplicant/crypto_gnutls.c
+++ b/crypto_gnutls.c
diff --git a/contrib/wpa_supplicant/crypto_internal.c b/crypto_internal.c
index d0c20371a73d..d0c20371a73d 100644
--- a/contrib/wpa_supplicant/crypto_internal.c
+++ b/crypto_internal.c
diff --git a/contrib/wpa_supplicant/crypto_libtomcrypt.c b/crypto_libtomcrypt.c
index e82097f10a00..e82097f10a00 100644
--- a/contrib/wpa_supplicant/crypto_libtomcrypt.c
+++ b/crypto_libtomcrypt.c
diff --git a/contrib/wpa_supplicant/crypto_none.c b/crypto_none.c
index f18c2a8ded95..f18c2a8ded95 100644
--- a/contrib/wpa_supplicant/crypto_none.c
+++ b/crypto_none.c
diff --git a/contrib/wpa_supplicant/ctrl_iface.c b/ctrl_iface.c
index c84a9f9d75aa..c84a9f9d75aa 100644
--- a/contrib/wpa_supplicant/ctrl_iface.c
+++ b/ctrl_iface.c
diff --git a/contrib/wpa_supplicant/ctrl_iface.h b/ctrl_iface.h
index 051d99a67dc6..051d99a67dc6 100644
--- a/contrib/wpa_supplicant/ctrl_iface.h
+++ b/ctrl_iface.h
diff --git a/contrib/wpa_supplicant/ctrl_iface_dbus.c b/ctrl_iface_dbus.c
index ba7851694ba4..ba7851694ba4 100644
--- a/contrib/wpa_supplicant/ctrl_iface_dbus.c
+++ b/ctrl_iface_dbus.c
diff --git a/contrib/wpa_supplicant/ctrl_iface_dbus.h b/ctrl_iface_dbus.h
index b66c179c596e..b66c179c596e 100644
--- a/contrib/wpa_supplicant/ctrl_iface_dbus.h
+++ b/ctrl_iface_dbus.h
diff --git a/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c b/ctrl_iface_dbus_handlers.c
index 19972c008045..19972c008045 100644
--- a/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c
+++ b/ctrl_iface_dbus_handlers.c
diff --git a/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h b/ctrl_iface_dbus_handlers.h
index 0ae94c41b7ce..0ae94c41b7ce 100644
--- a/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h
+++ b/ctrl_iface_dbus_handlers.h
diff --git a/contrib/wpa_supplicant/ctrl_iface_named_pipe.c b/ctrl_iface_named_pipe.c
index 5813e089a86c..5813e089a86c 100644
--- a/contrib/wpa_supplicant/ctrl_iface_named_pipe.c
+++ b/ctrl_iface_named_pipe.c
diff --git a/contrib/wpa_supplicant/ctrl_iface_udp.c b/ctrl_iface_udp.c
index bb6f11d50c9c..bb6f11d50c9c 100644
--- a/contrib/wpa_supplicant/ctrl_iface_udp.c
+++ b/ctrl_iface_udp.c
diff --git a/contrib/wpa_supplicant/ctrl_iface_unix.c b/ctrl_iface_unix.c
index 9e4f85fabaad..9e4f85fabaad 100644
--- a/contrib/wpa_supplicant/ctrl_iface_unix.c
+++ b/ctrl_iface_unix.c
diff --git a/contrib/wpa_supplicant/dbus-wpa_supplicant.conf b/dbus-wpa_supplicant.conf
index 51a29e3a89c0..51a29e3a89c0 100644
--- a/contrib/wpa_supplicant/dbus-wpa_supplicant.conf
+++ b/dbus-wpa_supplicant.conf
diff --git a/contrib/wpa_supplicant/dbus-wpa_supplicant.service b/dbus-wpa_supplicant.service
index a9ce1ecda63f..a9ce1ecda63f 100644
--- a/contrib/wpa_supplicant/dbus-wpa_supplicant.service
+++ b/dbus-wpa_supplicant.service
diff --git a/contrib/wpa_supplicant/dbus_dict_helpers.c b/dbus_dict_helpers.c
index 2852ed522cd4..2852ed522cd4 100644
--- a/contrib/wpa_supplicant/dbus_dict_helpers.c
+++ b/dbus_dict_helpers.c
diff --git a/contrib/wpa_supplicant/dbus_dict_helpers.h b/dbus_dict_helpers.h
index f873efcbcb13..f873efcbcb13 100644
--- a/contrib/wpa_supplicant/dbus_dict_helpers.h
+++ b/dbus_dict_helpers.h
diff --git a/contrib/wpa_supplicant/defconfig b/defconfig
index 73e5da555915..73e5da555915 100644
--- a/contrib/wpa_supplicant/defconfig
+++ b/defconfig
diff --git a/contrib/wpa_supplicant/defs.h b/defs.h
index 603fc55c110a..603fc55c110a 100644
--- a/contrib/wpa_supplicant/defs.h
+++ b/defs.h
diff --git a/contrib/wpa_supplicant/des.c b/des.c
index 8e0d56fc6af1..8e0d56fc6af1 100644
--- a/contrib/wpa_supplicant/des.c
+++ b/des.c
diff --git a/contrib/wpa_supplicant/developer.txt b/developer.txt
index bc5b34645d1a..bc5b34645d1a 100644
--- a/contrib/wpa_supplicant/developer.txt
+++ b/developer.txt
diff --git a/contrib/wpa_supplicant/doc/code_structure.doxygen b/doc/code_structure.doxygen
index 23b7f22a05bc..23b7f22a05bc 100644
--- a/contrib/wpa_supplicant/doc/code_structure.doxygen
+++ b/doc/code_structure.doxygen
diff --git a/contrib/wpa_supplicant/doc/ctrl_iface.doxygen b/doc/ctrl_iface.doxygen
index d64978664e14..d64978664e14 100644
--- a/contrib/wpa_supplicant/doc/ctrl_iface.doxygen
+++ b/doc/ctrl_iface.doxygen
diff --git a/contrib/wpa_supplicant/doc/docbook/Makefile b/doc/docbook/Makefile
index 15c019c960b2..15c019c960b2 100644
--- a/contrib/wpa_supplicant/doc/docbook/Makefile
+++ b/doc/docbook/Makefile
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_background.8 b/doc/docbook/wpa_background.8
index 6244529e69a9..6244529e69a9 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_background.8
+++ b/doc/docbook/wpa_background.8
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml b/doc/docbook/wpa_background.sgml
index 91b08bc42d0d..91b08bc42d0d 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml
+++ b/doc/docbook/wpa_background.sgml
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_cli.8 b/doc/docbook/wpa_cli.8
index 0865264a69a2..0865264a69a2 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_cli.8
+++ b/doc/docbook/wpa_cli.8
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml b/doc/docbook/wpa_cli.sgml
index 8430599efb73..8430599efb73 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml
+++ b/doc/docbook/wpa_cli.sgml
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8 b/doc/docbook/wpa_passphrase.8
index a0f5c7039863..a0f5c7039863 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8
+++ b/doc/docbook/wpa_passphrase.8
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml b/doc/docbook/wpa_passphrase.sgml
index eacb119ee382..eacb119ee382 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
+++ b/doc/docbook/wpa_passphrase.sgml
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8 b/doc/docbook/wpa_supplicant.8
index 1a5697d84229..1a5697d84229 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8
+++ b/doc/docbook/wpa_supplicant.8
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 b/doc/docbook/wpa_supplicant.conf.5
index efe17cc8762b..efe17cc8762b 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
+++ b/doc/docbook/wpa_supplicant.conf.5
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml b/doc/docbook/wpa_supplicant.conf.sgml
index 082509cc77aa..082509cc77aa 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml
+++ b/doc/docbook/wpa_supplicant.conf.sgml
diff --git a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/doc/docbook/wpa_supplicant.sgml
index b46d13c1f9ef..b46d13c1f9ef 100644
--- a/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+++ b/doc/docbook/wpa_supplicant.sgml
diff --git a/contrib/wpa_supplicant/doc/doxygen.fast b/doc/doxygen.fast
index 597fd372c60c..597fd372c60c 100644
--- a/contrib/wpa_supplicant/doc/doxygen.fast
+++ b/doc/doxygen.fast
diff --git a/contrib/wpa_supplicant/doc/doxygen.full b/doc/doxygen.full
index 9ed2ef845afb..9ed2ef845afb 100644
--- a/contrib/wpa_supplicant/doc/doxygen.full
+++ b/doc/doxygen.full
diff --git a/contrib/wpa_supplicant/doc/driver_wrapper.doxygen b/doc/driver_wrapper.doxygen
index 232739a0688b..232739a0688b 100644
--- a/contrib/wpa_supplicant/doc/driver_wrapper.doxygen
+++ b/doc/driver_wrapper.doxygen
diff --git a/contrib/wpa_supplicant/doc/eap.doxygen b/doc/eap.doxygen
index 988b304c62cf..988b304c62cf 100644
--- a/contrib/wpa_supplicant/doc/eap.doxygen
+++ b/doc/eap.doxygen
diff --git a/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl b/doc/kerneldoc2doxygen.pl
index 68835a1ddd31..68835a1ddd31 100755
--- a/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl
+++ b/doc/kerneldoc2doxygen.pl
diff --git a/contrib/wpa_supplicant/doc/mainpage.doxygen b/doc/mainpage.doxygen
index 6e58af8738e0..6e58af8738e0 100644
--- a/contrib/wpa_supplicant/doc/mainpage.doxygen
+++ b/doc/mainpage.doxygen
diff --git a/contrib/wpa_supplicant/doc/porting.doxygen b/doc/porting.doxygen
index 581da487e20f..581da487e20f 100644
--- a/contrib/wpa_supplicant/doc/porting.doxygen
+++ b/doc/porting.doxygen
diff --git a/contrib/wpa_supplicant/doc/testing_tools.doxygen b/doc/testing_tools.doxygen
index a2ae0c250fdd..a2ae0c250fdd 100644
--- a/contrib/wpa_supplicant/doc/testing_tools.doxygen
+++ b/doc/testing_tools.doxygen
diff --git a/contrib/wpa_supplicant/doc/wpa_supplicant.fig b/doc/wpa_supplicant.fig
index 06abfb54b61b..06abfb54b61b 100644
--- a/contrib/wpa_supplicant/doc/wpa_supplicant.fig
+++ b/doc/wpa_supplicant.fig
diff --git a/contrib/wpa_supplicant/driver.h b/driver.h
index ba5c5e6e375e..ba5c5e6e375e 100644
--- a/contrib/wpa_supplicant/driver.h
+++ b/driver.h
diff --git a/contrib/wpa_supplicant/driver_hostap.h b/driver_hostap.h
index a83322f7e237..a83322f7e237 100644
--- a/contrib/wpa_supplicant/driver_hostap.h
+++ b/driver_hostap.h
diff --git a/contrib/wpa_supplicant/driver_ndis.c b/driver_ndis.c
index 570b4ca1a183..570b4ca1a183 100644
--- a/contrib/wpa_supplicant/driver_ndis.c
+++ b/driver_ndis.c
diff --git a/contrib/wpa_supplicant/driver_ndis.h b/driver_ndis.h
index cdce4bac85ab..cdce4bac85ab 100644
--- a/contrib/wpa_supplicant/driver_ndis.h
+++ b/driver_ndis.h
diff --git a/contrib/wpa_supplicant/driver_ndis_.c b/driver_ndis_.c
index e71b13be9a7a..e71b13be9a7a 100644
--- a/contrib/wpa_supplicant/driver_ndis_.c
+++ b/driver_ndis_.c
diff --git a/contrib/wpa_supplicant/driver_wired.c b/driver_wired.c
index f987d3d73f54..f987d3d73f54 100644
--- a/contrib/wpa_supplicant/driver_wired.c
+++ b/driver_wired.c
diff --git a/contrib/wpa_supplicant/drivers.c b/drivers.c
index d7cbbbdc32b9..d7cbbbdc32b9 100644
--- a/contrib/wpa_supplicant/drivers.c
+++ b/drivers.c
diff --git a/contrib/wpa_supplicant/eap.c b/eap.c
index a5cd9824fc62..a5cd9824fc62 100644
--- a/contrib/wpa_supplicant/eap.c
+++ b/eap.c
diff --git a/contrib/wpa_supplicant/eap.h b/eap.h
index f1f78c2997f6..f1f78c2997f6 100644
--- a/contrib/wpa_supplicant/eap.h
+++ b/eap.h
diff --git a/contrib/wpa_supplicant/eap_aka.c b/eap_aka.c
index a8b56ca67302..a8b56ca67302 100644
--- a/contrib/wpa_supplicant/eap_aka.c
+++ b/eap_aka.c
diff --git a/contrib/wpa_supplicant/eap_defs.h b/eap_defs.h
index 8ea923a8f9d0..8ea923a8f9d0 100644
--- a/contrib/wpa_supplicant/eap_defs.h
+++ b/eap_defs.h
diff --git a/contrib/wpa_supplicant/eap_fast.c b/eap_fast.c
index d9347a986d9d..d9347a986d9d 100644
--- a/contrib/wpa_supplicant/eap_fast.c
+++ b/eap_fast.c
diff --git a/contrib/wpa_supplicant/eap_gpsk.c b/eap_gpsk.c
index 81b03ede5991..81b03ede5991 100644
--- a/contrib/wpa_supplicant/eap_gpsk.c
+++ b/eap_gpsk.c
diff --git a/contrib/wpa_supplicant/eap_gpsk_common.c b/eap_gpsk_common.c
index 7422fa6c48f9..7422fa6c48f9 100644
--- a/contrib/wpa_supplicant/eap_gpsk_common.c
+++ b/eap_gpsk_common.c
diff --git a/contrib/wpa_supplicant/eap_gpsk_common.h b/eap_gpsk_common.h
index a30ab97ffa07..a30ab97ffa07 100644
--- a/contrib/wpa_supplicant/eap_gpsk_common.h
+++ b/eap_gpsk_common.h
diff --git a/contrib/wpa_supplicant/eap_gtc.c b/eap_gtc.c
index ed4f8f32f629..ed4f8f32f629 100644
--- a/contrib/wpa_supplicant/eap_gtc.c
+++ b/eap_gtc.c
diff --git a/contrib/wpa_supplicant/eap_i.h b/eap_i.h
index ad7a1dd496d9..ad7a1dd496d9 100644
--- a/contrib/wpa_supplicant/eap_i.h
+++ b/eap_i.h
diff --git a/contrib/wpa_supplicant/eap_leap.c b/eap_leap.c
index aa6e05707d41..aa6e05707d41 100644
--- a/contrib/wpa_supplicant/eap_leap.c
+++ b/eap_leap.c
diff --git a/contrib/wpa_supplicant/eap_md5.c b/eap_md5.c
index 5dc16854c938..5dc16854c938 100644
--- a/contrib/wpa_supplicant/eap_md5.c
+++ b/eap_md5.c
diff --git a/contrib/wpa_supplicant/eap_methods.c b/eap_methods.c
index 53c7e629d0b7..53c7e629d0b7 100644
--- a/contrib/wpa_supplicant/eap_methods.c
+++ b/eap_methods.c
diff --git a/contrib/wpa_supplicant/eap_methods.h b/eap_methods.h
index 625c4d16b8dc..625c4d16b8dc 100644
--- a/contrib/wpa_supplicant/eap_methods.h
+++ b/eap_methods.h
diff --git a/contrib/wpa_supplicant/eap_mschapv2.c b/eap_mschapv2.c
index 26c835148980..26c835148980 100644
--- a/contrib/wpa_supplicant/eap_mschapv2.c
+++ b/eap_mschapv2.c
diff --git a/contrib/wpa_supplicant/eap_otp.c b/eap_otp.c
index 4cb131f30b4e..4cb131f30b4e 100644
--- a/contrib/wpa_supplicant/eap_otp.c
+++ b/eap_otp.c
diff --git a/contrib/wpa_supplicant/eap_pax.c b/eap_pax.c
index d9d937dc1fbc..d9d937dc1fbc 100644
--- a/contrib/wpa_supplicant/eap_pax.c
+++ b/eap_pax.c
diff --git a/contrib/wpa_supplicant/eap_pax_common.c b/eap_pax_common.c
index 80110469dcc3..80110469dcc3 100644
--- a/contrib/wpa_supplicant/eap_pax_common.c
+++ b/eap_pax_common.c
diff --git a/contrib/wpa_supplicant/eap_pax_common.h b/eap_pax_common.h
index bbad5e4052ff..bbad5e4052ff 100644
--- a/contrib/wpa_supplicant/eap_pax_common.h
+++ b/eap_pax_common.h
diff --git a/contrib/wpa_supplicant/eap_peap.c b/eap_peap.c
index 12bd8d8e2f9e..12bd8d8e2f9e 100644
--- a/contrib/wpa_supplicant/eap_peap.c
+++ b/eap_peap.c
diff --git a/contrib/wpa_supplicant/eap_psk.c b/eap_psk.c
index e07b25b026a9..e07b25b026a9 100644
--- a/contrib/wpa_supplicant/eap_psk.c
+++ b/eap_psk.c
diff --git a/contrib/wpa_supplicant/eap_psk_common.c b/eap_psk_common.c
index 8d896ae639d5..8d896ae639d5 100644
--- a/contrib/wpa_supplicant/eap_psk_common.c
+++ b/eap_psk_common.c
diff --git a/contrib/wpa_supplicant/eap_psk_common.h b/eap_psk_common.h
index e1bdccf5916a..e1bdccf5916a 100644
--- a/contrib/wpa_supplicant/eap_psk_common.h
+++ b/eap_psk_common.h
diff --git a/contrib/wpa_supplicant/eap_sake.c b/eap_sake.c
index 85ca4a41d88a..85ca4a41d88a 100644
--- a/contrib/wpa_supplicant/eap_sake.c
+++ b/eap_sake.c
diff --git a/contrib/wpa_supplicant/eap_sake_common.c b/eap_sake_common.c
index 4b5476f101c8..4b5476f101c8 100644
--- a/contrib/wpa_supplicant/eap_sake_common.c
+++ b/eap_sake_common.c
diff --git a/contrib/wpa_supplicant/eap_sake_common.h b/eap_sake_common.h
index ac6e8199d66b..ac6e8199d66b 100644
--- a/contrib/wpa_supplicant/eap_sake_common.h
+++ b/eap_sake_common.h
diff --git a/contrib/wpa_supplicant/eap_sim.c b/eap_sim.c
index 53c198734980..53c198734980 100644
--- a/contrib/wpa_supplicant/eap_sim.c
+++ b/eap_sim.c
diff --git a/contrib/wpa_supplicant/eap_sim_common.c b/eap_sim_common.c
index cc430239ab97..cc430239ab97 100644
--- a/contrib/wpa_supplicant/eap_sim_common.c
+++ b/eap_sim_common.c
diff --git a/contrib/wpa_supplicant/eap_sim_common.h b/eap_sim_common.h
index 9c983a864e3e..9c983a864e3e 100644
--- a/contrib/wpa_supplicant/eap_sim_common.h
+++ b/eap_sim_common.h
diff --git a/contrib/wpa_supplicant/eap_testing.txt b/eap_testing.txt
index 18c5c3f936b2..18c5c3f936b2 100644
--- a/contrib/wpa_supplicant/eap_testing.txt
+++ b/eap_testing.txt
diff --git a/contrib/wpa_supplicant/eap_tls.c b/eap_tls.c
index 03fcd89aed56..03fcd89aed56 100644
--- a/contrib/wpa_supplicant/eap_tls.c
+++ b/eap_tls.c
diff --git a/contrib/wpa_supplicant/eap_tls_common.c b/eap_tls_common.c
index 95ae0622d4eb..95ae0622d4eb 100644
--- a/contrib/wpa_supplicant/eap_tls_common.c
+++ b/eap_tls_common.c
diff --git a/contrib/wpa_supplicant/eap_tls_common.h b/eap_tls_common.h
index 59de922c0ecb..59de922c0ecb 100644
--- a/contrib/wpa_supplicant/eap_tls_common.h
+++ b/eap_tls_common.h
diff --git a/contrib/wpa_supplicant/eap_tlv.c b/eap_tlv.c
index e5f29b630301..e5f29b630301 100644
--- a/contrib/wpa_supplicant/eap_tlv.c
+++ b/eap_tlv.c
diff --git a/contrib/wpa_supplicant/eap_tlv.h b/eap_tlv.h
index 789eeaadb1b8..789eeaadb1b8 100644
--- a/contrib/wpa_supplicant/eap_tlv.h
+++ b/eap_tlv.h
diff --git a/contrib/wpa_supplicant/eap_ttls.c b/eap_ttls.c
index ca0069439ac4..ca0069439ac4 100644
--- a/contrib/wpa_supplicant/eap_ttls.c
+++ b/eap_ttls.c
diff --git a/contrib/wpa_supplicant/eap_ttls.h b/eap_ttls.h
index e0b2cbf45488..e0b2cbf45488 100644
--- a/contrib/wpa_supplicant/eap_ttls.h
+++ b/eap_ttls.h
diff --git a/contrib/wpa_supplicant/eap_vendor_test.c b/eap_vendor_test.c
index 7db76be25f9d..7db76be25f9d 100644
--- a/contrib/wpa_supplicant/eap_vendor_test.c
+++ b/eap_vendor_test.c
diff --git a/contrib/wpa_supplicant/eapol_sm.c b/eapol_sm.c
index b76a75dc783e..b76a75dc783e 100644
--- a/contrib/wpa_supplicant/eapol_sm.c
+++ b/eapol_sm.c
diff --git a/contrib/wpa_supplicant/eapol_sm.h b/eapol_sm.h
index 927bfcb6595b..927bfcb6595b 100644
--- a/contrib/wpa_supplicant/eapol_sm.h
+++ b/eapol_sm.h
diff --git a/contrib/wpa_supplicant/eapol_test.c b/eapol_test.c
index 52cba3615b17..52cba3615b17 100644
--- a/contrib/wpa_supplicant/eapol_test.c
+++ b/eapol_test.c
diff --git a/contrib/wpa_supplicant/eloop.c b/eloop.c
index 232e7533cab2..232e7533cab2 100644
--- a/contrib/wpa_supplicant/eloop.c
+++ b/eloop.c
diff --git a/contrib/wpa_supplicant/eloop.h b/eloop.h
index 4dd2871760df..4dd2871760df 100644
--- a/contrib/wpa_supplicant/eloop.h
+++ b/eloop.h
diff --git a/contrib/wpa_supplicant/eloop_none.c b/eloop_none.c
index 6943109d955f..6943109d955f 100644
--- a/contrib/wpa_supplicant/eloop_none.c
+++ b/eloop_none.c
diff --git a/contrib/wpa_supplicant/eloop_win.c b/eloop_win.c
index 73f0eafeeb8b..73f0eafeeb8b 100644
--- a/contrib/wpa_supplicant/eloop_win.c
+++ b/eloop_win.c
diff --git a/contrib/wpa_supplicant/events.c b/events.c
index 7fa74359e809..7fa74359e809 100644
--- a/contrib/wpa_supplicant/events.c
+++ b/events.c
diff --git a/contrib/wpa_supplicant/examples/ieee8021x.conf b/examples/ieee8021x.conf
index e8a5503d8359..e8a5503d8359 100644
--- a/contrib/wpa_supplicant/examples/ieee8021x.conf
+++ b/examples/ieee8021x.conf
diff --git a/contrib/wpa_supplicant/examples/plaintext.conf b/examples/plaintext.conf
index 542ac1dd3b96..542ac1dd3b96 100644
--- a/contrib/wpa_supplicant/examples/plaintext.conf
+++ b/examples/plaintext.conf
diff --git a/contrib/wpa_supplicant/examples/wep.conf b/examples/wep.conf
index 9c7b55f2722a..9c7b55f2722a 100644
--- a/contrib/wpa_supplicant/examples/wep.conf
+++ b/examples/wep.conf
diff --git a/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf b/examples/wpa-psk-tkip.conf
index 93d7fc2444ea..93d7fc2444ea 100644
--- a/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf
+++ b/examples/wpa-psk-tkip.conf
diff --git a/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf b/examples/wpa2-eap-ccmp.conf
index d7a64d87b254..d7a64d87b254 100644
--- a/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf
+++ b/examples/wpa2-eap-ccmp.conf
diff --git a/contrib/wpa_supplicant/hostap_common.h b/hostap_common.h
index 003ad9ac6b58..003ad9ac6b58 100644
--- a/contrib/wpa_supplicant/hostap_common.h
+++ b/hostap_common.h
diff --git a/contrib/wpa_supplicant/hostapd.h b/hostapd.h
index 5ae9c8cc4f9e..5ae9c8cc4f9e 100644
--- a/contrib/wpa_supplicant/hostapd.h
+++ b/hostapd.h
diff --git a/contrib/wpa_supplicant/includes.h b/includes.h
index 84308c3a37a2..84308c3a37a2 100644
--- a/contrib/wpa_supplicant/includes.h
+++ b/includes.h
diff --git a/contrib/wpa_supplicant/l2_packet.h b/l2_packet.h
index 540f0a116b56..540f0a116b56 100644
--- a/contrib/wpa_supplicant/l2_packet.h
+++ b/l2_packet.h
diff --git a/contrib/wpa_supplicant/libtommath.c b/libtommath.c
index b637707f31a8..b637707f31a8 100644
--- a/contrib/wpa_supplicant/libtommath.c
+++ b/libtommath.c
diff --git a/contrib/wpa_supplicant/main.c b/main.c
index 5fe4e7bdba18..5fe4e7bdba18 100644
--- a/contrib/wpa_supplicant/main.c
+++ b/main.c
diff --git a/contrib/wpa_supplicant/md4.c b/md4.c
index 41c84a3a7b5d..41c84a3a7b5d 100644
--- a/contrib/wpa_supplicant/md4.c
+++ b/md4.c
diff --git a/contrib/wpa_supplicant/md5.c b/md5.c
index a7db7aa9a771..a7db7aa9a771 100644
--- a/contrib/wpa_supplicant/md5.c
+++ b/md5.c
diff --git a/contrib/wpa_supplicant/md5.h b/md5.h
index e82f3969ed08..e82f3969ed08 100644
--- a/contrib/wpa_supplicant/md5.h
+++ b/md5.h
diff --git a/contrib/wpa_supplicant/mlme.c b/mlme.c
index 92b59598b50e..92b59598b50e 100644
--- a/contrib/wpa_supplicant/mlme.c
+++ b/mlme.c
diff --git a/contrib/wpa_supplicant/mlme.h b/mlme.h
index 9f6f5eb2acd5..9f6f5eb2acd5 100644
--- a/contrib/wpa_supplicant/mlme.h
+++ b/mlme.h
diff --git a/contrib/wpa_supplicant/ms_funcs.c b/ms_funcs.c
index d7231799d1c7..d7231799d1c7 100644
--- a/contrib/wpa_supplicant/ms_funcs.c
+++ b/ms_funcs.c
diff --git a/contrib/wpa_supplicant/ms_funcs.h b/ms_funcs.h
index 8067c097214a..8067c097214a 100644
--- a/contrib/wpa_supplicant/ms_funcs.h
+++ b/ms_funcs.h
diff --git a/contrib/wpa_supplicant/nmake.mak b/nmake.mak
index 3afabadeb9b5..3afabadeb9b5 100644
--- a/contrib/wpa_supplicant/nmake.mak
+++ b/nmake.mak
diff --git a/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch b/openssl-0.9.8d-tls-extensions.patch
index eec6db8a1341..eec6db8a1341 100644
--- a/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch
+++ b/openssl-0.9.8d-tls-extensions.patch
diff --git a/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch b/openssl-0.9.8e-tls-extensions.patch
index ede053f779b6..ede053f779b6 100644
--- a/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch
+++ b/openssl-0.9.8e-tls-extensions.patch
diff --git a/contrib/wpa_supplicant/openssl-tls-extensions.patch b/openssl-tls-extensions.patch
index 44490cca226e..44490cca226e 100644
--- a/contrib/wpa_supplicant/openssl-tls-extensions.patch
+++ b/openssl-tls-extensions.patch
diff --git a/contrib/wpa_supplicant/os.h b/os.h
index 25570a5e171a..25570a5e171a 100644
--- a/contrib/wpa_supplicant/os.h
+++ b/os.h
diff --git a/contrib/wpa_supplicant/os_internal.c b/os_internal.c
index b2183ea38f4d..b2183ea38f4d 100644
--- a/contrib/wpa_supplicant/os_internal.c
+++ b/os_internal.c
diff --git a/contrib/wpa_supplicant/os_none.c b/os_none.c
index 7404e2293af5..7404e2293af5 100644
--- a/contrib/wpa_supplicant/os_none.c
+++ b/os_none.c
diff --git a/contrib/wpa_supplicant/os_unix.c b/os_unix.c
index 69ba25a3e856..69ba25a3e856 100644
--- a/contrib/wpa_supplicant/os_unix.c
+++ b/os_unix.c
diff --git a/contrib/wpa_supplicant/pcsc_funcs.c b/pcsc_funcs.c
index cf8e3b009506..cf8e3b009506 100644
--- a/contrib/wpa_supplicant/pcsc_funcs.c
+++ b/pcsc_funcs.c
diff --git a/contrib/wpa_supplicant/pcsc_funcs.h b/pcsc_funcs.h
index 543f7c598419..543f7c598419 100644
--- a/contrib/wpa_supplicant/pcsc_funcs.h
+++ b/pcsc_funcs.h
diff --git a/contrib/wpa_supplicant/pmksa_cache.c b/pmksa_cache.c
index 127c3571bb6a..127c3571bb6a 100644
--- a/contrib/wpa_supplicant/pmksa_cache.c
+++ b/pmksa_cache.c
diff --git a/contrib/wpa_supplicant/pmksa_cache.h b/pmksa_cache.h
index 7fe6ff3429f3..7fe6ff3429f3 100644
--- a/contrib/wpa_supplicant/pmksa_cache.h
+++ b/pmksa_cache.h
diff --git a/contrib/wpa_supplicant/preauth.c b/preauth.c
index 4873c49030e2..4873c49030e2 100644
--- a/contrib/wpa_supplicant/preauth.c
+++ b/preauth.c
diff --git a/contrib/wpa_supplicant/preauth.h b/preauth.h
index 07e3e006622a..07e3e006622a 100644
--- a/contrib/wpa_supplicant/preauth.h
+++ b/preauth.h
diff --git a/contrib/wpa_supplicant/preauth_test.c b/preauth_test.c
index bd31d8b443e9..bd31d8b443e9 100644
--- a/contrib/wpa_supplicant/preauth_test.c
+++ b/preauth_test.c
diff --git a/contrib/wpa_supplicant/radius.c b/radius.c
index 743f3400f1de..743f3400f1de 100644
--- a/contrib/wpa_supplicant/radius.c
+++ b/radius.c
diff --git a/contrib/wpa_supplicant/radius.h b/radius.h
index d4375376a94f..d4375376a94f 100644
--- a/contrib/wpa_supplicant/radius.h
+++ b/radius.h
diff --git a/contrib/wpa_supplicant/radius_client.c b/radius_client.c
index 81cd9c58b16b..81cd9c58b16b 100644
--- a/contrib/wpa_supplicant/radius_client.c
+++ b/radius_client.c
diff --git a/contrib/wpa_supplicant/radius_client.h b/radius_client.h
index df1ba1f9b209..df1ba1f9b209 100644
--- a/contrib/wpa_supplicant/radius_client.h
+++ b/radius_client.h
diff --git a/contrib/wpa_supplicant/rc4.c b/rc4.c
index 8480cc55cea6..8480cc55cea6 100644
--- a/contrib/wpa_supplicant/rc4.c
+++ b/rc4.c
diff --git a/contrib/wpa_supplicant/rc4.h b/rc4.h
index 01f13833ddc8..01f13833ddc8 100644
--- a/contrib/wpa_supplicant/rc4.h
+++ b/rc4.h
diff --git a/contrib/wpa_supplicant/rsa.c b/rsa.c
index bfc0d5222495..bfc0d5222495 100644
--- a/contrib/wpa_supplicant/rsa.c
+++ b/rsa.c
diff --git a/contrib/wpa_supplicant/rsa.h b/rsa.h
index ac50dfd69d3e..ac50dfd69d3e 100644
--- a/contrib/wpa_supplicant/rsa.h
+++ b/rsa.h
diff --git a/contrib/wpa_supplicant/sha1.c b/sha1.c
index 194db1601d1e..194db1601d1e 100644
--- a/contrib/wpa_supplicant/sha1.c
+++ b/sha1.c
diff --git a/contrib/wpa_supplicant/sha1.h b/sha1.h
index 97affa1a620d..97affa1a620d 100644
--- a/contrib/wpa_supplicant/sha1.h
+++ b/sha1.h
diff --git a/contrib/wpa_supplicant/sha256.c b/sha256.c
index 175ec8b637da..175ec8b637da 100644
--- a/contrib/wpa_supplicant/sha256.c
+++ b/sha256.c
diff --git a/contrib/wpa_supplicant/sha256.h b/sha256.h
index dc597f09b53a..dc597f09b53a 100644
--- a/contrib/wpa_supplicant/sha256.h
+++ b/sha256.h
diff --git a/contrib/wpa_supplicant/state_machine.h b/state_machine.h
index 62766bf40ba4..62766bf40ba4 100644
--- a/contrib/wpa_supplicant/state_machine.h
+++ b/state_machine.h
diff --git a/contrib/wpa_supplicant/tests/test_aes.c b/tests/test_aes.c
index 09c2d8e3586e..09c2d8e3586e 100644
--- a/contrib/wpa_supplicant/tests/test_aes.c
+++ b/tests/test_aes.c
diff --git a/contrib/wpa_supplicant/tests/test_eap_sim_common.c b/tests/test_eap_sim_common.c
index ee3eee4d2911..ee3eee4d2911 100644
--- a/contrib/wpa_supplicant/tests/test_eap_sim_common.c
+++ b/tests/test_eap_sim_common.c
diff --git a/contrib/wpa_supplicant/tests/test_md4.c b/tests/test_md4.c
index e92e9a5fafdd..e92e9a5fafdd 100644
--- a/contrib/wpa_supplicant/tests/test_md4.c
+++ b/tests/test_md4.c
diff --git a/contrib/wpa_supplicant/tests/test_md5.c b/tests/test_md5.c
index d8fb41ef694e..d8fb41ef694e 100644
--- a/contrib/wpa_supplicant/tests/test_md5.c
+++ b/tests/test_md5.c
diff --git a/contrib/wpa_supplicant/tests/test_ms_funcs.c b/tests/test_ms_funcs.c
index 09b53c46f34f..09b53c46f34f 100644
--- a/contrib/wpa_supplicant/tests/test_ms_funcs.c
+++ b/tests/test_ms_funcs.c
diff --git a/contrib/wpa_supplicant/tests/test_sha1.c b/tests/test_sha1.c
index a34e3bf4bbc1..a34e3bf4bbc1 100644
--- a/contrib/wpa_supplicant/tests/test_sha1.c
+++ b/tests/test_sha1.c
diff --git a/contrib/wpa_supplicant/tests/test_sha256.c b/tests/test_sha256.c
index 161533ea7365..161533ea7365 100644
--- a/contrib/wpa_supplicant/tests/test_sha256.c
+++ b/tests/test_sha256.c
diff --git a/contrib/wpa_supplicant/tests/test_x509v3.c b/tests/test_x509v3.c
index aa98ecedd76f..aa98ecedd76f 100644
--- a/contrib/wpa_supplicant/tests/test_x509v3.c
+++ b/tests/test_x509v3.c
diff --git a/contrib/wpa_supplicant/tls.h b/tls.h
index 30d8842837fc..30d8842837fc 100644
--- a/contrib/wpa_supplicant/tls.h
+++ b/tls.h
diff --git a/contrib/wpa_supplicant/tls_gnutls.c b/tls_gnutls.c
index 07893983189d..07893983189d 100644
--- a/contrib/wpa_supplicant/tls_gnutls.c
+++ b/tls_gnutls.c
diff --git a/contrib/wpa_supplicant/tls_internal.c b/tls_internal.c
index a3858dd8a9c7..a3858dd8a9c7 100644
--- a/contrib/wpa_supplicant/tls_internal.c
+++ b/tls_internal.c
diff --git a/contrib/wpa_supplicant/tls_none.c b/tls_none.c
index ad08d5076c88..ad08d5076c88 100644
--- a/contrib/wpa_supplicant/tls_none.c
+++ b/tls_none.c
diff --git a/contrib/wpa_supplicant/tls_openssl.c b/tls_openssl.c
index d5aafaaa89d4..d5aafaaa89d4 100644
--- a/contrib/wpa_supplicant/tls_openssl.c
+++ b/tls_openssl.c
diff --git a/contrib/wpa_supplicant/tls_schannel.c b/tls_schannel.c
index 4ecfae0063fb..4ecfae0063fb 100644
--- a/contrib/wpa_supplicant/tls_schannel.c
+++ b/tls_schannel.c
diff --git a/contrib/wpa_supplicant/tlsv1_client.c b/tlsv1_client.c
index 2d62ff0ab60c..2d62ff0ab60c 100644
--- a/contrib/wpa_supplicant/tlsv1_client.c
+++ b/tlsv1_client.c
diff --git a/contrib/wpa_supplicant/tlsv1_client.h b/tlsv1_client.h
index dced874d1bfc..dced874d1bfc 100644
--- a/contrib/wpa_supplicant/tlsv1_client.h
+++ b/tlsv1_client.h
diff --git a/contrib/wpa_supplicant/tlsv1_common.c b/tlsv1_common.c
index 8432398bf517..8432398bf517 100644
--- a/contrib/wpa_supplicant/tlsv1_common.c
+++ b/tlsv1_common.c
diff --git a/contrib/wpa_supplicant/tlsv1_common.h b/tlsv1_common.h
index 9ecabfa2762b..9ecabfa2762b 100644
--- a/contrib/wpa_supplicant/tlsv1_common.h
+++ b/tlsv1_common.h
diff --git a/contrib/wpa_supplicant/todo.txt b/todo.txt
index edfff4fd1673..edfff4fd1673 100644
--- a/contrib/wpa_supplicant/todo.txt
+++ b/todo.txt
diff --git a/contrib/wpa_supplicant/version.h b/version.h
index 364d8aea9657..364d8aea9657 100644
--- a/contrib/wpa_supplicant/version.h
+++ b/version.h
diff --git a/contrib/wpa_supplicant/wpa.c b/wpa.c
index 5669e6a330e5..5669e6a330e5 100644
--- a/contrib/wpa_supplicant/wpa.c
+++ b/wpa.c
diff --git a/contrib/wpa_supplicant/wpa.h b/wpa.h
index df075c35d101..df075c35d101 100644
--- a/contrib/wpa_supplicant/wpa.h
+++ b/wpa.h
diff --git a/contrib/wpa_supplicant/wpa_cli.c b/wpa_cli.c
index 7176c956af67..7176c956af67 100644
--- a/contrib/wpa_supplicant/wpa_cli.c
+++ b/wpa_cli.c
diff --git a/contrib/wpa_supplicant/wpa_common.h b/wpa_common.h
index 6d0316ce4a38..6d0316ce4a38 100644
--- a/contrib/wpa_supplicant/wpa_common.h
+++ b/wpa_common.h
diff --git a/contrib/wpa_supplicant/wpa_ctrl.c b/wpa_ctrl.c
index dcec537fc7a2..dcec537fc7a2 100644
--- a/contrib/wpa_supplicant/wpa_ctrl.c
+++ b/wpa_ctrl.c
diff --git a/contrib/wpa_supplicant/wpa_ctrl.h b/wpa_ctrl.h
index 6166fda26ee9..6166fda26ee9 100644
--- a/contrib/wpa_supplicant/wpa_ctrl.h
+++ b/wpa_ctrl.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp b/wpa_gui-qt4/eventhistory.cpp
index ebf3c9712d45..ebf3c9712d45 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
+++ b/wpa_gui-qt4/eventhistory.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_gui-qt4/eventhistory.h
index 40dff6d6d779..40dff6d6d779 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h
+++ b/wpa_gui-qt4/eventhistory.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui b/wpa_gui-qt4/eventhistory.ui
index d47f461380a5..d47f461380a5 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
+++ b/wpa_gui-qt4/eventhistory.ui
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h b/wpa_gui-qt4/eventhistory.ui.h
index cb2caab2e4e1..cb2caab2e4e1 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h
+++ b/wpa_gui-qt4/eventhistory.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_gui-qt4/main.cpp
index eeeda399d862..eeeda399d862 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp
+++ b/wpa_gui-qt4/main.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_gui-qt4/networkconfig.cpp
index 6ea35e0a259a..6ea35e0a259a 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+++ b/wpa_gui-qt4/networkconfig.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_gui-qt4/networkconfig.h
index 5a12d70f1f21..5a12d70f1f21 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h
+++ b/wpa_gui-qt4/networkconfig.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui b/wpa_gui-qt4/networkconfig.ui
index 6b15da4af69b..6b15da4af69b 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+++ b/wpa_gui-qt4/networkconfig.ui
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h b/wpa_gui-qt4/networkconfig.ui.h
index 5e87462e8a5a..5e87462e8a5a 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h
+++ b/wpa_gui-qt4/networkconfig.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_gui-qt4/scanresults.cpp
index 57cf71637ce9..57cf71637ce9 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+++ b/wpa_gui-qt4/scanresults.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_gui-qt4/scanresults.h
index 22b54c9b49e6..22b54c9b49e6 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h
+++ b/wpa_gui-qt4/scanresults.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui b/wpa_gui-qt4/scanresults.ui
index 4a49b05ca8ae..4a49b05ca8ae 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui
+++ b/wpa_gui-qt4/scanresults.ui
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h b/wpa_gui-qt4/scanresults.ui.h
index 530d2e6a495c..530d2e6a495c 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h
+++ b/wpa_gui-qt4/scanresults.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling b/wpa_gui-qt4/setup-mingw-cross-compiling
index e173b0013781..e173b0013781 100755
--- a/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling
+++ b/wpa_gui-qt4/setup-mingw-cross-compiling
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp b/wpa_gui-qt4/userdatarequest.cpp
index e198955b4d93..e198955b4d93 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
+++ b/wpa_gui-qt4/userdatarequest.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_gui-qt4/userdatarequest.h
index 2b6e8371bc65..2b6e8371bc65 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
+++ b/wpa_gui-qt4/userdatarequest.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui b/wpa_gui-qt4/userdatarequest.ui
index ea0172194987..ea0172194987 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
+++ b/wpa_gui-qt4/userdatarequest.ui
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h b/wpa_gui-qt4/userdatarequest.ui.h
index 4b47ccdbad0d..4b47ccdbad0d 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h
+++ b/wpa_gui-qt4/userdatarequest.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_gui-qt4/wpa_gui.pro
index 0d1c32b5714c..0d1c32b5714c 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
+++ b/wpa_gui-qt4/wpa_gui.pro
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_gui-qt4/wpagui.cpp
index 31cb38c4c0fd..31cb38c4c0fd 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_gui-qt4/wpagui.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_gui-qt4/wpagui.h
index cd5c1afa4463..cd5c1afa4463 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h
+++ b/wpa_gui-qt4/wpagui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui b/wpa_gui-qt4/wpagui.ui
index 7047a2a106fc..7047a2a106fc 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+++ b/wpa_gui-qt4/wpagui.ui
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h b/wpa_gui-qt4/wpagui.ui.h
index 58760e734471..58760e734471 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h
+++ b/wpa_gui-qt4/wpagui.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_gui-qt4/wpamsg.h
index 65ce2e884414..65ce2e884414 100644
--- a/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h
+++ b/wpa_gui-qt4/wpamsg.h
diff --git a/contrib/wpa_supplicant/wpa_gui/eventhistory.ui b/wpa_gui/eventhistory.ui
index 3735fb70e8f9..3735fb70e8f9 100644
--- a/contrib/wpa_supplicant/wpa_gui/eventhistory.ui
+++ b/wpa_gui/eventhistory.ui
diff --git a/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h b/wpa_gui/eventhistory.ui.h
index cb2caab2e4e1..cb2caab2e4e1 100644
--- a/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h
+++ b/wpa_gui/eventhistory.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui/main.cpp b/wpa_gui/main.cpp
index a78473a8c6b1..a78473a8c6b1 100644
--- a/contrib/wpa_supplicant/wpa_gui/main.cpp
+++ b/wpa_gui/main.cpp
diff --git a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui b/wpa_gui/networkconfig.ui
index 1f98372f5cd9..1f98372f5cd9 100644
--- a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui
+++ b/wpa_gui/networkconfig.ui
diff --git a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h b/wpa_gui/networkconfig.ui.h
index a3cd733d06c2..a3cd733d06c2 100644
--- a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h
+++ b/wpa_gui/networkconfig.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui/scanresults.ui b/wpa_gui/scanresults.ui
index 66c8b4b76f32..66c8b4b76f32 100644
--- a/contrib/wpa_supplicant/wpa_gui/scanresults.ui
+++ b/wpa_gui/scanresults.ui
diff --git a/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h b/wpa_gui/scanresults.ui.h
index 530d2e6a495c..530d2e6a495c 100644
--- a/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h
+++ b/wpa_gui/scanresults.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling b/wpa_gui/setup-mingw-cross-compiling
index 07e4a8fb6b98..07e4a8fb6b98 100755
--- a/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling
+++ b/wpa_gui/setup-mingw-cross-compiling
diff --git a/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui b/wpa_gui/userdatarequest.ui
index c3d545fa620a..c3d545fa620a 100644
--- a/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui
+++ b/wpa_gui/userdatarequest.ui
diff --git a/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h b/wpa_gui/userdatarequest.ui.h
index 4b47ccdbad0d..4b47ccdbad0d 100644
--- a/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h
+++ b/wpa_gui/userdatarequest.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro b/wpa_gui/wpa_gui.pro
index 07829ba30334..07829ba30334 100644
--- a/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro
+++ b/wpa_gui/wpa_gui.pro
diff --git a/contrib/wpa_supplicant/wpa_gui/wpagui.ui b/wpa_gui/wpagui.ui
index 01666a363479..01666a363479 100644
--- a/contrib/wpa_supplicant/wpa_gui/wpagui.ui
+++ b/wpa_gui/wpagui.ui
diff --git a/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h b/wpa_gui/wpagui.ui.h
index 6db886243fa6..6db886243fa6 100644
--- a/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h
+++ b/wpa_gui/wpagui.ui.h
diff --git a/contrib/wpa_supplicant/wpa_gui/wpamsg.h b/wpa_gui/wpamsg.h
index f3fce06978c7..f3fce06978c7 100644
--- a/contrib/wpa_supplicant/wpa_gui/wpamsg.h
+++ b/wpa_gui/wpamsg.h
diff --git a/contrib/wpa_supplicant/wpa_i.h b/wpa_i.h
index b5adb5e2c0d7..b5adb5e2c0d7 100644
--- a/contrib/wpa_supplicant/wpa_i.h
+++ b/wpa_i.h
diff --git a/contrib/wpa_supplicant/wpa_passphrase.c b/wpa_passphrase.c
index 96b0c32c2cee..96b0c32c2cee 100644
--- a/contrib/wpa_supplicant/wpa_passphrase.c
+++ b/wpa_passphrase.c
diff --git a/contrib/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant.c
index b7d3066d63fc..b7d3066d63fc 100644
--- a/contrib/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant.c
diff --git a/contrib/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant.conf
index ec8b0eeb3f21..ec8b0eeb3f21 100644
--- a/contrib/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant.conf
diff --git a/contrib/wpa_supplicant/wpa_supplicant.h b/wpa_supplicant.h
index 763f30d2add3..763f30d2add3 100644
--- a/contrib/wpa_supplicant/wpa_supplicant.h
+++ b/wpa_supplicant.h
diff --git a/contrib/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant_i.h
index 95d171c0a23f..95d171c0a23f 100644
--- a/contrib/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant_i.h
diff --git a/contrib/wpa_supplicant/x509v3.c b/x509v3.c
index 484c54bad897..484c54bad897 100644
--- a/contrib/wpa_supplicant/x509v3.c
+++ b/x509v3.c
diff --git a/contrib/wpa_supplicant/x509v3.h b/x509v3.h
index a52bcf886453..a52bcf886453 100644
--- a/contrib/wpa_supplicant/x509v3.h
+++ b/x509v3.h