Move milenage.[ch] into src/crypto

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 6524ff0190ffa829d58437be8a62f8c595205be4..5ca65534de3123e35a385bff0ad6e2c1dee160e3 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -721,7 +721,7 @@ ifdef TLS_FUNCS
 LIBS_n += -lcrypto
 endif
 
-HOBJS += ../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/hlr_auc_gw/milenage.o
+HOBJS += ../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
 HOBJS += ../src/crypto/aes-encblock.o
 ifdef CONFIG_INTERNAL_AES
 HOBJS += ../src/crypto/aes-internal.o

diff --git a/src/hlr_auc_gw/milenage.c b/src/crypto/milenage.c
similarity index 100%
rename from src/hlr_auc_gw/milenage.c
rename to src/crypto/milenage.c

diff --git a/src/hlr_auc_gw/milenage.h b/src/crypto/milenage.h
similarity index 100%
rename from src/hlr_auc_gw/milenage.h
rename to src/crypto/milenage.h

diff --git a/src/eap_peer/eap_aka.c b/src/eap_peer/eap_aka.c
index f00031e1af13963e7551eec82ea2706f6dc78980..182f01a5e60ad1700768c31c05067e47d9b0b224 100644 (file)
--- a/src/eap_peer/eap_aka.c
+++ b/src/eap_peer/eap_aka.c
@@ -19,7 +19,7 @@
 #include "crypto/crypto.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
-#include "hlr_auc_gw/milenage.h"
+#include "crypto/milenage.h"
 #include "eap_common/eap_sim_common.h"
 #include "eap_config.h"
 #include "eap_i.h"

diff --git a/src/eap_peer/eap_sim.c b/src/eap_peer/eap_sim.c
index 5e30d1f7ed4170d36183de504769337614e8057c..3d8afb22fb00a9d1badffbf6e5470bd0f15f262f 100644 (file)
--- a/src/eap_peer/eap_sim.c
+++ b/src/eap_peer/eap_sim.c
@@ -15,13 +15,11 @@
 #include "includes.h"
 
 #include "common.h"
+#include "pcsc_funcs.h"
+#include "crypto/milenage.h"
 #include "eap_peer/eap_i.h"
 #include "eap_config.h"
-#include "pcsc_funcs.h"
 #include "eap_common/eap_sim_common.h"
-#ifdef CONFIG_SIM_SIMULATOR
-#include "hlr_auc_gw/milenage.h"
-#endif /* CONFIG_SIM_SIMULATOR */
 
 
 struct eap_sim_data {

diff --git a/src/hlr_auc_gw/hlr_auc_gw.c b/src/hlr_auc_gw/hlr_auc_gw.c
index e318903543ad4cf2b85e51eed866ceaf371224f5..36934aa9728aa637c1ff5518096a5eaac6bf3b81 100644 (file)
--- a/src/hlr_auc_gw/hlr_auc_gw.c
+++ b/src/hlr_auc_gw/hlr_auc_gw.c
@@ -47,7 +47,7 @@
 #include <sys/un.h>
 
 #include "common.h"
-#include "milenage.h"
+#include "crypto/milenage.h"
 
 static const char *default_socket_path = "/tmp/hlr_auc_gw.sock";
 static const char *socket_path;

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 3cb88540bfdbdfc36f67a03bda995efca31b14b9..abd207644cc6026c2ce16c0de7cd48324bc97ce1 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -670,7 +670,7 @@ NEED_MILENAGE=y
 endif
 
 ifdef NEED_MILENAGE
-OBJS += ../src/hlr_auc_gw/milenage.o
+OBJS += ../src/crypto/milenage.o
 endif
 
 ifdef CONFIG_PKCS12