From 18294a832f49218d40dc4252230978ce7219d2d1 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 24 Jul 2014 15:57:14 +0000
Subject: [PATCH] allow eea1 encryption
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5600 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/rrc_eNB_S1AP.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 7648851152..94500550c5 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -191,11 +191,9 @@ static e_SecurityAlgorithmConfig__cipheringAlgorithm rrc_eNB_select_ciphering(ui
return SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
}
-#if defined (ENABLE_SNOW_3G)
if (algorithms & S1AP_ENCRYPTION_EEA1_MASK) {
return SecurityAlgorithmConfig__cipheringAlgorithm_eea1;
}
-#endif
return SecurityAlgorithmConfig__cipheringAlgorithm_eea0;
}
@@ -536,7 +534,7 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t 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);
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,
@@ -545,7 +543,6 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index,
ue_index);
}
}
-
itti_send_msg_to_task (TASK_S1AP, mod_id, message_p);
}
#else
--
GitLab