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

undoing commit 5856, which break the NAS attach procedure with the Centos EPC

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5869 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Florian Kaltenberger
2014-10-10 15:34:17 +00:00
parent 3ea09ff824
commit cd9be8f6dd
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LITE/rrc_eNB_S1AP.c
+6 -8
View File
@@ -60,14 +60,12 @@
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_EEA0_MASK = 0x8000;
static const uint16_t S1AP_ENCRYPTION_EEA1_MASK = 0x4000;
static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x2000;
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_EIA0_MASK = 0x8000;
static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x4000;
static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x2000;
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
@@ -186,8 +184,8 @@ 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;
#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;