From 0cdb95add1dfd1c02f367c54067f2a7b7cf53521 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 22 May 2014 08:34:51 +0000
Subject: [PATCH] Bug correction in AS Security Mode Command (algorithm
selection, wrong bitmask), temporary forced eea0. eiax selection now OK
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5332 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/rrc_eNB.c | 18 +++----
openair2/RRC/LITE/rrc_eNB_S1AP.c | 81 ++++++++++++++++++--------------
2 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 3f4a9529ed..21b60af79a 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1131,23 +1131,23 @@ static void rrc_eNB_generate_defaultRRCConnectionReconfiguration(
size = do_RRCConnectionReconfiguration(enb_mod_idP, buffer, ue_mod_idP, rrc_eNB_get_next_transaction_identifier(enb_mod_idP), //Transaction_id,
#ifdef EXMIMO_IOT
- NULL,
-#else
- SRB_configList2,
+ NULL,
+#else
+ SRB_configList2,
#endif
- *DRB_configList, NULL, // DRB2_list,
- NULL, // *sps_Config,
+ *DRB_configList, NULL, // DRB2_list,
+ NULL, // *sps_Config,
#ifdef EXMIMO_IOT
- NULL, NULL, NULL, NULL,NULL,
+ NULL, NULL, NULL, NULL,NULL,
#else
- physicalConfigDedicated[ue_mod_idP], MeasObj_list, ReportConfig_list, quantityConfig, MeasId_list,
+ physicalConfigDedicated[ue_mod_idP], MeasObj_list, ReportConfig_list, quantityConfig, MeasId_list,
#endif
- mac_MainConfig, NULL, NULL, Sparams, rsrp, cba_RNTI, dedicatedInfoNASList);
+ mac_MainConfig, NULL, NULL, Sparams, rsrp, cba_RNTI, dedicatedInfoNASList);
#ifdef RRC_MSG_PRINT
LOG_F(RRC,"[MSG] RRC Connection Reconfiguration\n");
for (i = 0; i < size; i++)
- LOG_F(RRC,"%02x ", ((uint8_t*)buffer)[i]);
+ LOG_F(RRC,"%02x ", ((uint8_t*)buffer)[i]);
LOG_F(RRC,"\n");
////////////////////////////////////////
#endif
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 9a7fe7d379..8c3c407e96 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -64,17 +64,17 @@ Address : EURECOM,
static const uint16_t UE_INITIAL_ID_INVALID = 0;
/* Masks for S1AP Encryption algorithms, EEA0 is always supported (not coded) */
-static const uint16_t S1AP_ENCRYPTION_EEA1_MASK = 0x1;
-static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x2;
+static const uint16_t S1AP_ENCRYPTION_EEA1_MASK = 0x8000;
+static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x4000;
/* Masks for S1AP Integrity algorithms, EIA0 is always supported (not coded) */
-static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x1;
-static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x2;
+static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x8000;
+static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x4000;
#ifdef Rel10
# define INTEGRITY_ALGORITHM_NONE SecurityAlgorithmConfig__integrityProtAlgorithm_eia0_v920
#else
-#ifndef EXMIMO_IOT
+#ifdef EXMIMO_IOT
# define INTEGRITY_ALGORITHM_NONE SecurityAlgorithmConfig__integrityProtAlgorithm_eia2
#else
# define INTEGRITY_ALGORITHM_NONE SecurityAlgorithmConfig__integrityProtAlgorithm_reserved
@@ -188,6 +188,9 @@ static uint8_t get_UE_index_from_s1ap_ids(uint8_t mod_id, uint16_t ue_initial_id
*/
static e_SecurityAlgorithmConfig__cipheringAlgorithm rrc_eNB_select_ciphering(uint16_t algorithms) {
+#warning "Forced return SecurityAlgorithmConfig__cipheringAlgorithm_eea0, to be deleted in future"
+ return SecurityAlgorithmConfig__cipheringAlgorithm_eea0;
+
if (algorithms & S1AP_ENCRYPTION_EEA2_MASK) {
return SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
}
@@ -236,6 +239,14 @@ static int rrc_eNB_process_security (uint8_t mod_id, uint8_t ue_index, security_
/* Save security parameters */
eNB_rrc_inst[mod_id].Info.UE[ue_index].security_capabilities = *security_capabilities;
+ // translation
+ LOG_D(RRC,
+ "[eNB %d] NAS security_capabilities.encryption_algorithms %u AS ciphering_algorithm %u NAS security_capabilities.integrity_algorithms %u AS integrity_algorithm %u\n",
+ mod_id,
+ eNB_rrc_inst[mod_id].Info.UE[ue_index].security_capabilities.encryption_algorithms,
+ eNB_rrc_inst[mod_id].ciphering_algorithm[ue_index],
+ eNB_rrc_inst[mod_id].Info.UE[ue_index].security_capabilities.integrity_algorithms,
+ eNB_rrc_inst[mod_id].integrity_algorithm[ue_index]);
/* Select relevant algorithms */
cipheringAlgorithm = rrc_eNB_select_ciphering (eNB_rrc_inst[mod_id].Info.UE[ue_index].security_capabilities.encryption_algorithms);
if (eNB_rrc_inst[mod_id].ciphering_algorithm[ue_index] != cipheringAlgorithm) {
@@ -330,19 +341,19 @@ static void rrc_pdcp_config_security(uint8_t enb_mod_idP, uint8_t ue_mod_idP, ui
pdcp_p = &pdcp_array_srb_eNB[enb_mod_idP][ue_mod_idP][DCCH-1];
pdcp_config_set_security(pdcp_p,
- enb_mod_idP,
- ue_mod_idP,
- 0,
- ENB_FLAG_YES,
- DCCH,
- DCCH+2,
- (send_security_mode_command == TRUE) ?
- 0 | (eNB_rrc_inst[enb_mod_idP].integrity_algorithm[ue_mod_idP] << 4) :
- (eNB_rrc_inst[enb_mod_idP].ciphering_algorithm[ue_mod_idP] ) |
- (eNB_rrc_inst[enb_mod_idP].integrity_algorithm[ue_mod_idP] << 4),
- kRRCenc,
- kRRCint,
- kUPenc);
+ enb_mod_idP,
+ ue_mod_idP,
+ 0,
+ ENB_FLAG_YES,
+ DCCH,
+ DCCH+2,
+ (send_security_mode_command == TRUE) ?
+ 0 | (eNB_rrc_inst[enb_mod_idP].integrity_algorithm[ue_mod_idP] << 4) :
+ (eNB_rrc_inst[enb_mod_idP].ciphering_algorithm[ue_mod_idP] ) |
+ (eNB_rrc_inst[enb_mod_idP].integrity_algorithm[ue_mod_idP] << 4),
+ kRRCenc,
+ kRRCint,
+ kUPenc);
#endif
}
@@ -681,26 +692,26 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char
process_eNB_security_key (instance, ue_index, S1AP_INITIAL_CONTEXT_SETUP_REQ(msg_p).security_key);
{
- uint8_t send_security_mode_command = TRUE;
-
+ uint8_t send_security_mode_command = TRUE;
+
#ifndef EXMIMO_IOT
- if ((eNB_rrc_inst[instance].ciphering_algorithm[ue_index] == SecurityAlgorithmConfig__cipheringAlgorithm_eea0)
+ if ((eNB_rrc_inst[instance].ciphering_algorithm[ue_index] == SecurityAlgorithmConfig__cipheringAlgorithm_eea0)
&& (eNB_rrc_inst[instance].integrity_algorithm[ue_index] == INTEGRITY_ALGORITHM_NONE)) {
send_security_mode_command = FALSE;
- }
-#endif
- rrc_pdcp_config_security(instance, ue_index,send_security_mode_command);
-
- if (send_security_mode_command) {
-
- rrc_eNB_generate_SecurityModeCommand (instance, 0 /* TODO put frame number ! */, ue_index);
- send_security_mode_command = FALSE;
- // apply ciphering after RRC security command mode
- rrc_pdcp_config_security(instance, ue_index,send_security_mode_command);
- }
- else {
- rrc_eNB_generate_UECapabilityEnquiry (instance, 0 /* TODO put frame number ! */, ue_index);
- }
+ }
+#endif
+ rrc_pdcp_config_security(instance, ue_index,send_security_mode_command);
+
+ if (send_security_mode_command) {
+
+ rrc_eNB_generate_SecurityModeCommand (instance, 0 /* TODO put frame number ! */, ue_index);
+ send_security_mode_command = FALSE;
+ // apply ciphering after RRC security command mode
+ rrc_pdcp_config_security(instance, ue_index,send_security_mode_command);
+ }
+ else {
+ rrc_eNB_generate_UECapabilityEnquiry (instance, 0 /* TODO put frame number ! */, ue_index);
+ }
}
return (0);
}
--
GitLab