Move milenage.[ch] into src/crypto

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

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"

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 {

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;

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