aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-11-29 21:04:43 (GMT)
committerJouni Malinen <j@w1.fi>2009-11-29 21:04:43 (GMT)
commit03da66bd59567c90dc3b3b0892c3346472a0b413 (patch)
treee074941e0db7e35b7effbf93759aebe789f4105e /wpa_supplicant
parent5586f500a0c58b457e512ac01a2a316657474a15 (diff)
downloadhostap-03da66bd59567c90dc3b3b0892c3346472a0b413.zip
hostap-03da66bd59567c90dc3b3b0892c3346472a0b413.tar.gz
hostap-03da66bd59567c90dc3b3b0892c3346472a0b413.tar.bz2
Remove src/crypto from default include path
In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file.
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/Makefile3
-rw-r--r--wpa_supplicant/config.c2
-rw-r--r--wpa_supplicant/nmake.mak2
-rw-r--r--wpa_supplicant/symbian/wpa_supplicant.mmp2
-rw-r--r--wpa_supplicant/tests/test_aes.c4
-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.c6
-rw-r--r--wpa_supplicant/tests/test_sha256.c4
-rwxr-xr-xwpa_supplicant/vs2005/eapol_test/eapol_test.vcproj4
-rwxr-xr-xwpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj4
-rwxr-xr-xwpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj4
-rwxr-xr-xwpa_supplicant/vs2005/wpasvc/wpasvc.vcproj4
-rw-r--r--wpa_supplicant/wpa_passphrase.c2
-rw-r--r--wpa_supplicant/wps_supplicant.c14
-rw-r--r--wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj2
18 files changed, 31 insertions, 34 deletions
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index a8d2a1d..8daae75 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -10,7 +10,6 @@ export LIBDIR ?= /usr/local/lib/
export BINDIR ?= /usr/local/sbin/
CFLAGS += -I../src
-CFLAGS += -I../src/crypto
CFLAGS += -I../src/utils
ALL=wpa_supplicant wpa_passphrase wpa_cli
@@ -1365,7 +1364,7 @@ TEST_EAP_SIM_COMMON_OBJS = $(SHA1OBJS) $(MD5OBJS) \
../src/utils/wpa_debug.o $(AESOBJS) \
tests/test_eap_sim_common.o
test-eap_sim_common: $(TEST_EAP_SIM_COMMON_OBJS)
- $(LDO) $(LDFLAGS) -o $@ $(TEST_AES_OBJS) $(LIBS)
+ $(LDO) $(LDFLAGS) -o $@ $(TEST_EAP_SIM_COMMON_OBJS) $(LIBS)
./test-eap_sim_common
rm test-eap_sim_common
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 4734614..35c46fa 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -15,8 +15,8 @@
#include "includes.h"
#include "common.h"
+#include "crypto/sha1.h"
#include "rsn_supp/wpa.h"
-#include "sha1.h"
#include "eap_peer/eap.h"
#include "config.h"
diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak
index 34da978..2b20f64 100644
--- a/wpa_supplicant/nmake.mak
+++ b/wpa_supplicant/nmake.mak
@@ -48,7 +48,7 @@ CFLAGS = $(CFLAGS) /DPCSC_FUNCS
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 /I..\src\utils
CFLAGS = $(CFLAGS) /I.
CFLAGS = $(CFLAGS) /DWIN32
CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c
diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp
index 52e7411..217908e 100644
--- 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
+USERINCLUDE .. ..\..\src ..\..\src\utils
SOURCEPATH ..
SOURCE main_symbian.cpp
diff --git a/wpa_supplicant/tests/test_aes.c b/wpa_supplicant/tests/test_aes.c
index 38a9cf5..8c0b152 100644
--- a/wpa_supplicant/tests/test_aes.c
+++ b/wpa_supplicant/tests/test_aes.c
@@ -15,8 +15,8 @@
#include "includes.h"
#include "common.h"
-#include "crypto.h"
-#include "aes_wrap.h"
+#include "crypto/crypto.h"
+#include "crypto/aes_wrap.h"
#define BLOCK_SIZE 16
diff --git a/wpa_supplicant/tests/test_eap_sim_common.c b/wpa_supplicant/tests/test_eap_sim_common.c
index ee3eee4..deb19f6 100644
--- a/wpa_supplicant/tests/test_eap_sim_common.c
+++ b/wpa_supplicant/tests/test_eap_sim_common.c
@@ -12,7 +12,7 @@
* See README and COPYING for more details.
*/
-#include "eap_sim_common.c"
+#include "eap_common/eap_sim_common.c"
static int test_eap_sim_prf(void)
diff --git a/wpa_supplicant/tests/test_md4.c b/wpa_supplicant/tests/test_md4.c
index e92e9a5..4058486 100644
--- a/wpa_supplicant/tests/test_md4.c
+++ b/wpa_supplicant/tests/test_md4.c
@@ -15,7 +15,7 @@
#include "includes.h"
#include "common.h"
-#include "crypto.h"
+#include "crypto/crypto.h"
int main(int argc, char *argv[])
{
diff --git a/wpa_supplicant/tests/test_md5.c b/wpa_supplicant/tests/test_md5.c
index d8fb41e..ecd3183 100644
--- a/wpa_supplicant/tests/test_md5.c
+++ b/wpa_supplicant/tests/test_md5.c
@@ -15,7 +15,7 @@
#include "includes.h"
#include "common.h"
-#include "crypto.h"
+#include "crypto/crypto.h"
int main(int argc, char *argv[])
{
diff --git a/wpa_supplicant/tests/test_ms_funcs.c b/wpa_supplicant/tests/test_ms_funcs.c
index 09b53c4..231ccd2 100644
--- a/wpa_supplicant/tests/test_ms_funcs.c
+++ b/wpa_supplicant/tests/test_ms_funcs.c
@@ -12,7 +12,7 @@
* See README and COPYING for more details.
*/
-#include "ms_funcs.c"
+#include "crypto/ms_funcs.c"
int main(int argc, char *argv[])
diff --git a/wpa_supplicant/tests/test_sha1.c b/wpa_supplicant/tests/test_sha1.c
index d2e6a99..a2343cf 100644
--- a/wpa_supplicant/tests/test_sha1.c
+++ b/wpa_supplicant/tests/test_sha1.c
@@ -15,9 +15,9 @@
#include "includes.h"
#include "common.h"
-#include "sha1.h"
-#include "md5.h"
-#include "crypto.h"
+#include "crypto/crypto.h"
+#include "crypto/md5.h"
+#include "crypto/sha1.h"
static int test_eap_fast(void)
diff --git a/wpa_supplicant/tests/test_sha256.c b/wpa_supplicant/tests/test_sha256.c
index 7dc460d..f194ff9 100644
--- a/wpa_supplicant/tests/test_sha256.c
+++ b/wpa_supplicant/tests/test_sha256.c
@@ -15,8 +15,8 @@
#include "includes.h"
#include "common.h"
-#include "sha256.h"
-#include "crypto.h"
+#include "crypto/sha256.h"
+#include "crypto/crypto.h"
struct {
char *data;
diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
index 8ef522b..45b49ba 100755
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
index 4fa28df..dccf9b5 100755
--- a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
+++ b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\crypto;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\crypto;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 41a7c67..9d14f52 100755
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index 947cd9d..f7223da 100755
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/wpa_supplicant/wpa_passphrase.c b/wpa_supplicant/wpa_passphrase.c
index 96b0c32..67465aa 100644
--- a/wpa_supplicant/wpa_passphrase.c
+++ b/wpa_supplicant/wpa_passphrase.c
@@ -15,7 +15,7 @@
#include "includes.h"
#include "common.h"
-#include "sha1.h"
+#include "crypto/sha1.h"
int main(int argc, char *argv[])
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 2833e21..b25e8df 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -15,22 +15,22 @@
#include "includes.h"
#include "common.h"
+#include "eloop.h"
+#include "uuid.h"
+#include "crypto/dh_group5.h"
#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "common/wpa_common.h"
-#include "config.h"
+#include "common/wpa_ctrl.h"
+#include "eap_common/eap_wsc_common.h"
#include "eap_peer/eap.h"
+#include "rsn_supp/wpa.h"
+#include "config.h"
#include "wpa_supplicant_i.h"
#include "driver_i.h"
-#include "eloop.h"
-#include "uuid.h"
-#include "common/wpa_ctrl.h"
#include "notify.h"
-#include "eap_common/eap_wsc_common.h"
#include "blacklist.h"
-#include "rsn_supp/wpa.h"
#include "wps_supplicant.h"
-#include "dh_group5.h"
#define WPS_PIN_SCAN_IGNORE_SEL_REG 3
diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
index 8029fff..dc5aeb2 100644
--- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
+++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
@@ -453,7 +453,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
../../src,
- ../../src/crypto,
../../src/utils,
);
ONLY_ACTIVE_ARCH = YES;
@@ -475,7 +474,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
../../src,
- ../../src/crypto,
../../src/utils,
);
OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";