aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-12-06 14:33:19 (GMT)
committerJouni Malinen <j@w1.fi>2009-12-06 14:33:19 (GMT)
commit0e574b07f83c0595a71267e273de28c64187b1b6 (patch)
tree0375b4ce7f56b62f828538ef0377f90aa2c61867
parent912321e93537c409aa4d75866df9b8e855d3e554 (diff)
downloadhostap-0e574b07f83c0595a71267e273de28c64187b1b6.zip
hostap-0e574b07f83c0595a71267e273de28c64187b1b6.tar.gz
hostap-0e574b07f83c0595a71267e273de28c64187b1b6.tar.bz2
Move hlr_auc_gw into hostapd directory
This is a separate program and is used mainly with hostapd, so it is better to move this into the hostapd subdirectory now that Milenage code has already been moved into src/crypto. Milenage was the only generic component in hlr_auc_gw.
-rw-r--r--doc/directories.doxygen9
-rw-r--r--doc/doxygen.conf1
-rw-r--r--hostapd/Makefile2
-rw-r--r--hostapd/hlr_auc_gw.c (renamed from src/hlr_auc_gw/hlr_auc_gw.c)0
-rw-r--r--hostapd/hlr_auc_gw.milenage_db (renamed from src/hlr_auc_gw/hlr_auc_gw.milenage_db)0
-rw-r--r--src/Makefile2
-rw-r--r--src/hlr_auc_gw/Makefile9
7 files changed, 2 insertions, 21 deletions
diff --git a/doc/directories.doxygen b/doc/directories.doxygen
index 453d42a..7465afe 100644
--- a/doc/directories.doxygen
+++ b/doc/directories.doxygen
@@ -44,15 +44,6 @@ driver is used.
\dir src/eapol_supp EAPOL supplicant
-\dir src/hlr_auc_gw HLR/AuC gateway module for hostapd
-
-This is an example implementation of HLR/AuC gateway that hostapd can
-use for EAP-SIM and EAP-AKA server access. This example implements an
-internal authentication server using Milenage and GSM-Milenage.
-Alternative design could use this component as a gateway between an
-external HLR/AuC and EAP server code in hostapd.
-
-
\dir src/l2_packet Layer 2 packet interface
This module defines an interface for layer 2 (link layer) packet
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 67c185b..9c2fdf4 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -580,7 +580,6 @@ INPUT = \
src/eapol_supp \
src/eap_peer \
src/eap_server \
- src/hlr_auc_gw \
src/l2_packet \
src/radius \
src/rsn_supp \
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 42b1749..a607be2 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -726,7 +726,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/crypto/milenage.o
+HOBJS += 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/hlr_auc_gw.c b/hostapd/hlr_auc_gw.c
index 36934aa..36934aa 100644
--- a/src/hlr_auc_gw/hlr_auc_gw.c
+++ b/hostapd/hlr_auc_gw.c
diff --git a/src/hlr_auc_gw/hlr_auc_gw.milenage_db b/hostapd/hlr_auc_gw.milenage_db
index ecd06d7..ecd06d7 100644
--- a/src/hlr_auc_gw/hlr_auc_gw.milenage_db
+++ b/hostapd/hlr_auc_gw.milenage_db
diff --git a/src/Makefile b/src/Makefile
index 8aab4cc..faa5893 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=common crypto drivers hlr_auc_gw eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet radius rsn_supp tls utils wps
+SUBDIRS=common crypto drivers eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet radius rsn_supp tls utils wps
all:
for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d; done
diff --git a/src/hlr_auc_gw/Makefile b/src/hlr_auc_gw/Makefile
deleted file mode 100644
index cffba62..0000000
--- a/src/hlr_auc_gw/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all:
- @echo Nothing to be made.
-
-clean:
- for d in $(SUBDIRS); do make -C $$d clean; done
- rm -f *~ *.o *.d
-
-install:
- @echo Nothing to be made.