From cd9be8f6dd2d42944b4ef15c62ccd5340bb827c0 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Fri, 10 Oct 2014 15:34:17 +0000
Subject: [PATCH] undoing commit 5856, which break the NAS attach procedure
with the Centos EPC
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5869 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/rrc_eNB_S1AP.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 59be9abde7..84c8ea4d56 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -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;
--
GitLab