diff --git a/openair2/COMMON/as_message.h b/openair2/COMMON/as_message.h
index 5f7f6f3fa9e333cf97cc12a1407fedcd28494571..976a398061f1c7235df20e43f1d3103a6c057f4e 100644
--- a/openair2/COMMON/as_message.h
+++ b/openair2/COMMON/as_message.h
@@ -220,7 +220,6 @@ typedef struct broadcast_info_ind_s {
#define AS_HSDUPA (1 << NET_ACCESS_HSDUPA)
#define AS_EUTRAN (1 << NET_ACCESS_EUTRAN)
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
/*
* NAS->AS -K_eNB refresh request
* NAS request AS to refresh its KeNB key
@@ -228,7 +227,6 @@ typedef struct broadcast_info_ind_s {
typedef struct kenb_refresh_req_s {
Byte_t kenb[32];
} kenb_refresh_req_t;
-#endif
/*
* NAS->AS - Cell Information request
diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h
index d521eab0ffa703df85d904367995172a90472bdd..83cd8558d424c86f91012d9b87cc63a85ea45b6c 100644
--- a/openair2/COMMON/rrc_messages_def.h
+++ b/openair2/COMMON/rrc_messages_def.h
@@ -64,9 +64,7 @@ MESSAGE_DEF(RRC_STATE_IND, MESSAGE_PRIORITY_MED, RrcStateInd,
MESSAGE_DEF(RRC_CONFIGURATION_REQ, MESSAGE_PRIORITY_MED, RrcConfigurationReq, rrc_configuration_req)
// UE: NAS -> RRC messages
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
MESSAGE_DEF(NAS_KENB_REFRESH_REQ, MESSAGE_PRIORITY_MED, NasKenbRefreshReq, nas_kenb_refresh_req)
-#endif
MESSAGE_DEF(NAS_CELL_SELECTION_REQ, MESSAGE_PRIORITY_MED, NasCellSelectionReq, nas_cell_selection_req)
MESSAGE_DEF(NAS_CONN_ESTABLI_REQ, MESSAGE_PRIORITY_MED, NasConnEstabliReq, nas_conn_establi_req)
MESSAGE_DEF(NAS_UPLINK_DATA_REQ, MESSAGE_PRIORITY_MED, NasUlDataReq, nas_ul_data_req)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 908510d94b58ac2d9db6b4d82c468dc3de1c5916..1befc4a676e458b3f50767ee97b564322619c3cf 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -70,9 +70,7 @@ typedef UL_DCCH_Message_t RrcUlDcchMessage;
#define RRC_CONFIGURATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_configuration_req
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
#define NAS_KENB_REFRESH_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_kenb_refresh_req
-#endif
#define NAS_CELL_SELECTION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_cell_selection_req
#define NAS_CONN_ESTABLI_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_conn_establi_req
#define NAS_UPLINK_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_ul_data_req
@@ -186,9 +184,7 @@ typedef struct RrcConfigurationReq_s {
} RrcConfigurationReq;
// UE: NAS -> RRC messages
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
typedef kenb_refresh_req_t NasKenbRefreshReq;
-#endif
typedef cell_info_req_t NasCellSelectionReq;
typedef nas_establish_req_t NasConnEstabliReq;
typedef ul_info_transfer_req_t NasUlDataReq;
diff --git a/openair2/RRC/LITE/defs.h b/openair2/RRC/LITE/defs.h
index e34c532990da99cc14473fd2df183be903f5e2e0..b15b70b815e3dede3df2918865cfbf29d53d095d 100644
--- a/openair2/RRC/LITE/defs.h
+++ b/openair2/RRC/LITE/defs.h
@@ -182,11 +182,7 @@ typedef enum HO_STATE_e {
#define PAYLOAD_SIZE_MAX 1024
#define RRC_BUF_SIZE 255
#define UNDEF_SECURITY_MODE 0xff
-#if 1 // wilson 2016-05-01 let RRC security mode command to return OK instead of failed
#define NO_SECURITY_MODE 0x20
-#else
-#define NO_SECURITY_MODE 0x33
-#endif
#define CBA_OFFSET 0xfff4
// #define NUM_MAX_CBA_GROUP 4 // in the platform_constants
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index 51c7aa076d398b8bd545e53c6d4569da6d211fdc..d666e5468410e397204b59032bbbb69b0749751f 100644
--- a/openair2/RRC/LITE/rrc_UE.c
+++ b/openair2/RRC/LITE/rrc_UE.c
@@ -1403,7 +1403,6 @@ rrc_ue_process_securityModeCommand(
}
-#if 1 // wilson 2016-01-05 config PDCP security mode
#if defined(ENABLE_SECURITY)
uint8_t *kRRCenc = NULL;
uint8_t *kUPenc = NULL;
@@ -1458,7 +1457,6 @@ rrc_ue_process_securityModeCommand(
}
#endif //#if defined(ENABLE_SECURITY)
-#endif //#if 1 //wilson
if (securityModeCommand->criticalExtensions.present == SecurityModeCommand__criticalExtensions_PR_c1) {
if (securityModeCommand->criticalExtensions.choice.c1.present == SecurityModeCommand__criticalExtensions__c1_PR_securityModeCommand_r8) {
@@ -4131,7 +4129,6 @@ void *rrc_ue_task( void *args_p )
# if defined(ENABLE_USE_MME)
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
case NAS_KENB_REFRESH_REQ:
memcpy((void*)UE_rrc_inst[ue_mod_id].kenb, (void*)NAS_KENB_REFRESH_REQ(msg_p).kenb, sizeof(UE_rrc_inst[ue_mod_id].kenb));
@@ -4155,7 +4152,6 @@ void *rrc_ue_task( void *args_p )
UE_rrc_inst[ue_mod_id].kenb[28], UE_rrc_inst[ue_mod_id].kenb[29], UE_rrc_inst[ue_mod_id].kenb[30], UE_rrc_inst[ue_mod_id].kenb[31]);
break;
-#endif
/* NAS messages */
case NAS_CELL_SELECTION_REQ:
diff --git a/openair3/NAS/COMMON/API/NETWORK/l2_message.h b/openair3/NAS/COMMON/API/NETWORK/l2_message.h
index 603f7c0d7df21dd24ff6fdbdc7747df4fb1c35f5..9c349b8d06fdcbfa8089c3ff1423be04e64b13bd 100644
--- a/openair3/NAS/COMMON/API/NETWORK/l2_message.h
+++ b/openair3/NAS/COMMON/API/NETWORK/l2_message.h
@@ -124,7 +124,6 @@ typedef struct kenb_refresh_req_s {
Byte_t kenb[32];
} kenb_refresh_req_t;
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
/*
* NAS->AS - Cell Information request
* NAS request AS to search for a suitable cell belonging to the selected
@@ -134,7 +133,6 @@ typedef struct {
plmn_t plmnID; /* PLMN identifier */
Byte_t rat; /* Bitmap - set of radio access technologies */
} cell_info_req_t;
-#endif
/*
* AS->NAS - Cell Information response
diff --git a/openair3/NAS/UE/EMM/SecurityModeControl.c b/openair3/NAS/UE/EMM/SecurityModeControl.c
index fa500ad31651e2be2d2f4b1bbf422ced0ae64175..b3f2b6f8a89c66867ca6ce732ee29e840897f6b2 100755
--- a/openair3/NAS/UE/EMM/SecurityModeControl.c
+++ b/openair3/NAS/UE/EMM/SecurityModeControl.c
@@ -295,9 +295,7 @@ int emm_proc_security_mode_command(int native_ksi, int ksi,
_emm_data.security->selected_algorithms.encryption = seea;
_emm_data.security->selected_algorithms.integrity = seia;
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
nas_itti_kenb_refresh_req(_security_data.kenb.value);
-#endif
}
/*
* NAS security mode command not accepted by the UE
diff --git a/openair3/NAS/UE/nas_itti_messaging.c b/openair3/NAS/UE/nas_itti_messaging.c
index ff16c83ebfb6219bda551823a14e7d6a83cec23a..a28c7394b29ea1f350a5037ee0b6534962bd54cd 100755
--- a/openair3/NAS/UE/nas_itti_messaging.c
+++ b/openair3/NAS/UE/nas_itti_messaging.c
@@ -187,7 +187,6 @@ int nas_itti_protected_msg(const char *buffer, const nas_message_t *msg, const i
extern unsigned char NB_eNB_INST;
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
int nas_itti_kenb_refresh_req(const Byte_t kenb[32])
{
MessageDef *message_p;
@@ -220,7 +219,6 @@ int nas_itti_kenb_refresh_req(const Byte_t kenb[32])
return itti_send_msg_to_task(TASK_RRC_UE, NB_eNB_INST + 0 /* TODO to be virtualized */, message_p);
}
-#endif
int nas_itti_cell_info_req(const plmn_t plmnID, const Byte_t rat)
{
diff --git a/openair3/NAS/UE/nas_itti_messaging.h b/openair3/NAS/UE/nas_itti_messaging.h
index dc8d41a23918a9086ff3456d4fc10d369b3675ca..a9db232d70b299bd34fd651a7d6fca2df1257e78 100755
--- a/openair3/NAS/UE/nas_itti_messaging.h
+++ b/openair3/NAS/UE/nas_itti_messaging.h
@@ -55,9 +55,7 @@ int nas_itti_protected_msg(
# if defined(NAS_BUILT_IN_UE)
-#if 1 // wilson 2016-05-02 add new message to update kenb in RRC after NAS SMC complete
int nas_itti_kenb_refresh_req(const Byte_t kenb[32]);
-#endif
int nas_itti_cell_info_req(const plmn_t plmnID, const Byte_t rat);