Added processing of security key and corrected use of security algorithms...

Added processing of security key and corrected use of security algorithms information received from S1AP.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4537 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/RRC/LITE/defs.h

@@ -183,6 +183,9 @@ typedef struct eNB_RRC_UE_INFO_s {
 
     /* Information from S1AP initial_context_setup_req */
     uint32_t eNB_ue_s1ap_id :24;
+
+    security_capabilities_t security_capabilities;
+
     /* Number of e_rab to be setup in the list */
     uint8_t nb_of_e_rabs;
     /* list of e_rab to be setup by RRC layers */

openair2/RRC/LITE/rrc_eNB.c

@@ -457,6 +457,7 @@ static void rrc_lite_eNB_init_security(u8 Mod_id, u8 UE_index)
     for (i = 0; i < 32; i++) {
         sprintf(&ascii_buffer[2 * i], "%02X", eNB_rrc_inst[Mod_id].kenb[UE_index][i]);
     }
+    ascii_buffer[2 * i] = '\0';
 
     LOG_T(RRC, "[OSA][MOD %02d][UE %02d] kenb    = %s\n", Mod_id, UE_index, ascii_buffer);
 #endif
@@ -2408,13 +2409,6 @@ char openair_rrc_lite_eNB_init (u8 Mod_id)
   for (j = 0; j < NUMBER_OF_UE_MAX; j++)
     eNB_rrc_inst[Mod_id].Info.UE[j].Status = RRC_IDLE;     //CH_READY;
 
-  /* Init security parameters */
-  for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
-    eNB_rrc_inst[Mod_id].ciphering_algorithm[j] = SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
-    eNB_rrc_inst[Mod_id].integrity_algorithm[j] = SecurityAlgorithmConfig__integrityProtAlgorithm_eia2;
-    rrc_lite_eNB_init_security(Mod_id, j);
-  }
-
 #if defined(ENABLE_USE_MME)
   /* Connect eNB to MME */
   if (EPC_MODE_ENABLED > 0)
@@ -2427,7 +2421,16 @@ char openair_rrc_lite_eNB_init (u8 Mod_id)
         }
 # endif
     }
+  else
 #endif
+  {
+    /* Init security parameters */
+    for (j = 0; j < NUMBER_OF_UE_MAX; j++) {
+      eNB_rrc_inst[Mod_id].ciphering_algorithm[j] = SecurityAlgorithmConfig__cipheringAlgorithm_eea2;
+      eNB_rrc_inst[Mod_id].integrity_algorithm[j] = SecurityAlgorithmConfig__integrityProtAlgorithm_eia2;
+      rrc_lite_eNB_init_security(Mod_id, j);
+    }
+  }
 
   eNB_rrc_inst[Mod_id].Info.Nb_ue = 0;