From dcf9ba1a31c3c5cdb27a843d13f617f8ec0c9b99 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 9 Oct 2014 11:51:29 +0000
Subject: [PATCH] Ok tested bit mask for algorithms in virtualization mode
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5856 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/rrc_eNB_S1AP.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 84c8ea4d56..59be9abde7 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -60,12 +60,14 @@
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 = 0x8000;
-static const uint16_t S1AP_ENCRYPTION_EEA2_MASK = 0x4000;
+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;
/* Masks for S1AP Integrity algorithms, EIA0 is always supported (not coded) */
-static const uint16_t S1AP_INTEGRITY_EIA1_MASK = 0x8000;
-static const uint16_t S1AP_INTEGRITY_EIA2_MASK = 0x4000;
+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;
#ifdef Rel10
# define INTEGRITY_ALGORITHM_NONE SecurityAlgorithmConfig__integrityProtAlgorithm_eia0_v920
@@ -184,8 +186,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