maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5439 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Lionel Gauthier
2014-06-26 12:33:33 +00:00
parent 5015ea2b80
commit 7d46837d44
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair-cn/NAS/EURECOM-NAS/src/emm/Makefile
+14 -2
View File
@@ -5,8 +5,20 @@ endif
include $(PROJDIR)/Makerules include $(PROJDIR)/Makerules
include $(PROJDIR)/Makefile.inc include $(PROJDIR)/Makefile.inc
INCLUDES = -I. -I$(INCDIR) -I$(UTILDIR) -I$(USIMAPIDIR) -I$(MMEAPIDIR) \ INCLUDES = -I. \
-I$(ESMDIR) -I$(EMMSAPDIR) -I$(ESMDIR) -I$(ESMSAPDIR) -I$(EMMMSGDIR) -I$(IESDIR) -I$(INCDIR) \
-I$(UTILDIR) \
-I$(USIMAPIDIR) \
-I$(MMEAPIDIR) \
-I$(ESMDIR) \
-I$(EMMSAPDIR) \
-I$(ESMDIR) \
-I$(ESMSAPDIR) \
-I$(EMMMSGDIR) \
-I$(IESDIR) \
-I$(OPENAIRCN_DIR)/COMMON \
-I$(OPENAIRCN_DIR)/SECU
all: $(OBJS) all: $(OBJS)
@$(CD) $(EMMMSGDIR) && $(MAKE) @$(CD) $(EMMMSGDIR) && $(MAKE)
openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c
+4 -4
View File
@@ -435,9 +435,9 @@ int emm_proc_security_mode_control(unsigned int ueid, int ksi, int eea, int eia,
if ( ! emm_ctx->security->knas_int.value) { if ( ! emm_ctx->security->knas_int.value) {
emm_ctx->security->knas_int.value = malloc(AUTH_KNAS_INT_SIZE); emm_ctx->security->knas_int.value = malloc(AUTH_KNAS_INT_SIZE);
} else { } else {
AssertFatal( LOG_TRACE(ERROR,
emm_ctx->security->knas_int.length >= AUTH_KNAS_INT_SIZE,
" TODO realloc emm_ctx->security->knas_int OctetString"); " TODO realloc emm_ctx->security->knas_int OctetString");
LOG_FUNC_RETURN (RETURNerror);
} }
emm_ctx->security->knas_int.length = AUTH_KNAS_INT_SIZE; emm_ctx->security->knas_int.length = AUTH_KNAS_INT_SIZE;
derive_key_nas( derive_key_nas(
@@ -449,9 +449,9 @@ int emm_proc_security_mode_control(unsigned int ueid, int ksi, int eea, int eia,
if ( ! emm_ctx->security->knas_enc.value) { if ( ! emm_ctx->security->knas_enc.value) {
emm_ctx->security->knas_enc.value = malloc(AUTH_KNAS_ENC_SIZE); emm_ctx->security->knas_enc.value = malloc(AUTH_KNAS_ENC_SIZE);
} else { } else {
AssertFatal( LOG_TRACE(ERROR,
emm_ctx->security->knas_enc.length >= AUTH_KNAS_ENC_SIZE,
" TODO realloc emm_ctx->security->knas_enc OctetString"); " TODO realloc emm_ctx->security->knas_enc OctetString");
LOG_FUNC_RETURN (RETURNerror);
} }
emm_ctx->security->knas_enc.length = AUTH_KNAS_ENC_SIZE; emm_ctx->security->knas_enc.length = AUTH_KNAS_ENC_SIZE;
derive_key_nas( derive_key_nas(