Remove src/rsn_supp from default header path

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index c91758b964b901bd24610db3a36353c57f7753be..656f69e4a5122271f161a22b51aa720425b7ce1b 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -12,7 +12,6 @@ export BINDIR ?= /usr/local/sbin/
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/rsn_supp
 
 ALL=wpa_supplicant wpa_passphrase wpa_cli
 

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 128fe717dc7f1883e18632b79f07dc4b549511ef..473461477ca6fa7af5689a0bc76a0665d2a6c3d9 100644 (file)
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -15,7 +15,7 @@
 #include "includes.h"
 
 #include "common.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "sha1.h"
 #include "eap_peer/eap.h"
 #include "config.h"

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 0855db81b266d48eb9d37408ac24f6a9a6d23c53..8ceebd32152537e6b2cd7f40132dcc2cb80fd591 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -16,15 +16,15 @@
 
 #include "common.h"
 #include "eloop.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "config.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "ctrl_iface.h"
 #include "l2_packet/l2_packet.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/preauth.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
 #include "common/ieee802_11_defs.h"

diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c
index 55b1acb91f1fab91bf86abaf9b9059a3f611700b..d685697a0a9e78b469b2bd48241637f77ea2483f 100644 (file)
--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
+++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c
@@ -27,7 +27,7 @@
 #include "wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wps_supplicant.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 
 extern int wpa_debug_level;
 extern int wpa_debug_show_keys;

diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c
index 1b5ae681f6883393f0d68f7349a88ce335eb9498..0d493237c17699467b5859b48dcd8c4e3c3e9487 100644 (file)
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
@@ -23,7 +23,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "eap_peer/eap.h"
 #include "eloop.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eap_peer/eap_i.h"
 #include "wpa_supplicant_i.h"
 #include "radius/radius.h"

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index d5223c52c3a12305257a97d80a74e45c4786163f..9548cf58bd599b2451ffde13da0578da5cdf07dd 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -16,15 +16,15 @@
 
 #include "common.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "pcsc_funcs.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/preauth.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
 #include "notify.h"

diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c
index b15668441dae2b78e779fe7252aebd377fcd27a0..79878b54712b4aadf808079683d6680548e7f164 100644 (file)
--- a/wpa_supplicant/ibss_rsn.c
+++ b/wpa_supplicant/ibss_rsn.c
@@ -17,8 +17,8 @@
 #include "common.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_supplicant_i.h"
-#include "wpa.h"
-#include "wpa_ie.h"
+#include "rsn_supp/wpa.h"
+#include "rsn_supp/wpa_ie.h"
 #include "../hostapd/wpa.h"
 #include "ibss_rsn.h"
 

diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c
index a71df15ee1f059c27f9d3de822d24c11842e5b81..898a707a868ca00069c060d58daeb0566dbb2b79 100644 (file)
--- a/wpa_supplicant/mlme.c
+++ b/wpa_supplicant/mlme.c
@@ -22,7 +22,7 @@
 #include "wpa_supplicant_i.h"
 #include "notify.h"
 #include "driver_i.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
 #include "mlme.h"

diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak
index 8b9956f0e6ac381fb4c03552195e9e3e1e7fef90..34da9782f019c18ba4042f1a4b26c4a20481ce45 100644 (file)
--- a/wpa_supplicant/nmake.mak
+++ b/wpa_supplicant/nmake.mak
@@ -49,7 +49,7 @@ CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE
 CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE
 CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS
 CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto
-CFLAGS = $(CFLAGS) /I..\src\rsn_supp /I..\src\eapol_supp /I.
+CFLAGS = $(CFLAGS) /I.
 CFLAGS = $(CFLAGS) /DWIN32
 CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c
 CFLAGS = $(CFLAGS) /W3

diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c
index 3082191db78aa1d7dbfe1af782a6f0046126f989..b7916fbcd0178655ee0edfc26c505bd9df3e790e 100644 (file)
--- a/wpa_supplicant/preauth_test.c
+++ b/wpa_supplicant/preauth_test.c
@@ -22,14 +22,14 @@
 #include "config.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "eloop.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eap_peer/eap.h"
 #include "wpa_supplicant_i.h"
 #include "l2_packet/l2_packet.h"
 #include "ctrl_iface.h"
 #include "pcsc_funcs.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/preauth.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "drivers/driver.h"
 
 

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index b4fe000d0511e84899d9496584b6baa9881b84b2..734b2e980127662e2790538f3e4565a78d5ca507 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -18,8 +18,8 @@
 #include "common/ieee802_11_defs.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "common/wpa_common.h"
-#include "wpa.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/wpa.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "config.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"

diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp
index e16e08383dcc357c60d2e1665a6a1d5c32166834..52e741162a4069e586694fa198d19d383ac6a738 100644 (file)
--- a/wpa_supplicant/symbian/wpa_supplicant.mmp
+++ b/wpa_supplicant/symbian/wpa_supplicant.mmp
@@ -5,7 +5,7 @@ TARGETTYPE      exe
 
 SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc
 
-USERINCLUDE    .. ..\..\src ..\..\src\utils ..\..\src\crypto ..\..\src\rsn_supp
+USERINCLUDE    .. ..\..\src ..\..\src\utils ..\..\src\crypto
 
 SOURCEPATH     ..
 SOURCE         main_symbian.cpp

diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c
index af1aa0222ad2eaee71be69972fcc3910aaf79263..77fc36a140695df90a42a1800fa44f9163d914ae 100644 (file)
--- a/wpa_supplicant/tests/test_wpa.c
+++ b/wpa_supplicant/tests/test_wpa.c
@@ -18,8 +18,8 @@
 #include "eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "../config.h"
-#include "wpa.h"
-#include "wpa_ie.h"
+#include "rsn_supp/wpa.h"
+#include "rsn_supp/wpa_ie.h"
 #include "../hostapd/wpa.h"
 
 

diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
index 28cfa3db736b4dd219e2baede3d998af58be4420..8ef522bdf2f7b418d9fffd16ec318612623996c8 100755 (executable)
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 27918258cc39ee54c2844246b3faed97298dbc64..41a7c67a054a3146ece599e4bb1e722942b9a10c 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index a10b66d9a245b56e511533659f3a9f78c425156d..947cd9db56bc0bcc3727d19af1fd7f70b7bfa6b8 100755 (executable)
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index b73010acba62ac33b5345609b387dd1c08e1c120..d58e55b7a8631006fc667608f0d14d7d4c80b08b 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -22,7 +22,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "eap_peer/eap.h"
 #include "eap_server/eap_methods.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
@@ -31,8 +31,8 @@
 #include "ctrl_iface.h"
 #include "pcsc_funcs.h"
 #include "common/version.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/preauth.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "common/wpa_ctrl.h"
 #include "mlme.h"
 #include "common/ieee802_11_defs.h"

diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index a59c0f1870218d7aa6f5f8ca6abc5dc2f03fbe8e..f72bf3cc8d259991387eaf0b37af73d4e5334a15 100644 (file)
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -16,14 +16,14 @@
 
 #include "common.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
 #include "common/wpa_common.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "mlme.h"
 #include "sme.h"
 #include "common/ieee802_11_defs.h"

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index de0a3704941f06487f6cccfea07f7013338de8df..2833e21b5ffe0acb619217ef7fcf3ee9f910705b 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -28,7 +28,7 @@
 #include "notify.h"
 #include "eap_common/eap_wsc_common.h"
 #include "blacklist.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "wps_supplicant.h"
 #include "dh_group5.h"
 

diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
index 1d94554db755113a846de7f12570831dbcf2a0d6..8029fff6770c0dd5b18490dc34867992ba752c0f 100644 (file)
--- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
+++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
@@ -455,7 +455,6 @@
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/rsn_supp,
                                );
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
@@ -478,7 +477,6 @@
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/rsn_supp,
                                );
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
                                PREBINDING = NO;