update it

src/hss/Makefile.am

@@ -3,10 +3,10 @@
 noinst_LTLIBRARIES = libhss.la
 
 libhss_la_SOURCES = \
-	milenage.h kdf.h context.h
+	milenage.h hss_kdf.h hss_ctx.h
 
 nodist_libhss_la_SOURCES = \
-	milenage.c kdf.c init.c context.c
+	milenage.c hss_kdf.c hss_init.c hss_ctx.c
 
 libhss_la_DEPENDENCIES = \
     $(top_srcdir)/lib/core/src/libcore.la \

src/hss/hss_ctx.c

@@ -4,7 +4,7 @@
 #include "core_pool.h"
 #include "core_lib.h"
 
-#include "context.h"
+#include "hss_ctx.h"
 
 #define OP "5F1D289C5D354D0A140C2548F5F3E3BA"
 #define OPc "E8ED289DEBA952E4283B54E88E6183CA"

src/hss/hss_ctx.h

@@ -1,5 +1,5 @@
-#ifndef __CONTEXT_H__
-#define __CONTEXT_H__
+#ifndef __HSS_CTX_H__
+#define __HSS_CTX_H__
 
 #include "core_list.h"
 #include "core_errno.h"
@@ -51,4 +51,4 @@ CORE_DECLARE(ue_ctx_t*)     hss_ctx_ue_next(ue_ctx_t *ue);
 }
 #endif /* __cplusplus */
 
-#endif /* !__CONTEXT_H__ */
+#endif /* __HSS_CTX_H__ */

src/hss/hss_init.c

@@ -4,12 +4,12 @@
 #include "core_lib.h"
 #include "core_sha2.h"
 
-#include "kdf.h"
-#include "milenage.h"
-
-#include "context.h"
 #include "s6a_lib.h"
 
+#include "hss_ctx.h"
+#include "hss_kdf.h"
+#include "milenage.h"
+
 #define HSS_SQN_LEN 6
 #define HSS_AK_LEN 6
 

src/mme/Makefile.am

@@ -3,7 +3,7 @@
 noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
-	kdf.h kasumi.h snow_3g.h zuc.h \
+	mme_kdf.h kasumi.h snow_3g.h zuc.h \
     mme_event.h mme_ctx.h \
 	s1ap_build.h s1ap_handler.h s1ap_conv.h s1ap_path.h \
 	mme_s6a_handler.h \
@@ -12,7 +12,7 @@ libmme_la_SOURCES = \
 	mme_sm.h 
 
 nodist_libmme_la_SOURCES = \
-	kdf.c kasumi.c snow_3g.c zuc.c \
+	mme_kdf.c kasumi.c snow_3g.c zuc.c \
     mme_init.c mme_event.c mme_ctx.c \
 	s1ap_sm.c s1ap_build.c s1ap_handler.c s1ap_conv.c s1ap_path.c \
 	mme_s6a_handler.c \

src/mme/emm_handler.c

@@ -6,7 +6,7 @@
 
 #include "mme_event.h"
 
-#include "kdf.h"
+#include "mme_kdf.h"
 #include "nas_security.h"
 #include "nas_conv.h"
 #include "mme_s6a_handler.h"

src/mme/esm_handler.c

@@ -6,7 +6,7 @@
 
 #include "mme_event.h"
 
-#include "kdf.h"
+#include "mme_kdf.h"
 #include "nas_security.h"
 #include "nas_conv.h"
 #include "mme_s6a_handler.h"

test/security_test.c

@@ -6,7 +6,7 @@
 #include "nas_message.h"
 
 #include "milenage.h"
-#include "hss/kdf.h"
+#include "hss_kdf.h"
 #include "nas_security.h"
 
 #include "testutil.h"