Commit 18294a83 authored by Lionel Gauthier's avatar Lionel Gauthier

allow eea1 encryption

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5600 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 6855c4f9
...@@ -191,11 +191,9 @@ static e_SecurityAlgorithmConfig__cipheringAlgorithm rrc_eNB_select_ciphering(ui ...@@ -191,11 +191,9 @@ static e_SecurityAlgorithmConfig__cipheringAlgorithm rrc_eNB_select_ciphering(ui
return SecurityAlgorithmConfig__cipheringAlgorithm_eea2; return SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
} }
#if defined (ENABLE_SNOW_3G)
if (algorithms & S1AP_ENCRYPTION_EEA1_MASK) { if (algorithms & S1AP_ENCRYPTION_EEA1_MASK) {
return SecurityAlgorithmConfig__cipheringAlgorithm_eea1; return SecurityAlgorithmConfig__cipheringAlgorithm_eea1;
} }
#endif
return SecurityAlgorithmConfig__cipheringAlgorithm_eea0; return SecurityAlgorithmConfig__cipheringAlgorithm_eea0;
} }
...@@ -536,7 +534,7 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index, ...@@ -536,7 +534,7 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index,
ue_index); ue_index);
} }
} }
S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_code = BIT_STRING_to_uint8 (&r_mme->mmec); S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_code = BIT_STRING_to_uint8 (&r_mme->mmec);
S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_group_id = BIT_STRING_to_uint16 (&r_mme->mmegi); S1AP_NAS_FIRST_REQ (message_p).ue_identity.gummei.mme_group_id = BIT_STRING_to_uint16 (&r_mme->mmegi);
LOG_I(S1AP, "[eNB %d] Build S1AP_NAS_FIRST_REQ adding in s_TMSI: GUMMEI mme_code %u mme_group_id %u ue_index %d\n", LOG_I(S1AP, "[eNB %d] Build S1AP_NAS_FIRST_REQ adding in s_TMSI: GUMMEI mme_code %u mme_group_id %u ue_index %d\n",
mod_id, mod_id,
...@@ -545,7 +543,6 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index, ...@@ -545,7 +543,6 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index,
ue_index); ue_index);
} }
} }
itti_send_msg_to_task (TASK_S1AP, mod_id, message_p); itti_send_msg_to_task (TASK_S1AP, mod_id, message_p);
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment