encryption tested OK with EEA1 and NAS UE/CN from EURECOM: TO DO test with dongle in real time.

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

openair-cn/NAS/EURECOM-NAS/src/emm/SecurityModeControl.c

@@ -1144,15 +1144,15 @@ static int _security_select_algorithms(
         LOG_FUNC_RETURN (rc);
     }
 
-    if (ue_eeaP & (0x80 >> NAS_SECURITY_ALGORITHMS_EEA0)) {
+    if (ue_eeaP & (0x80 >> NAS_SECURITY_ALGORITHMS_EEA1)) {
+            LOG_TRACE(DEBUG,"Selected  NAS_SECURITY_ALGORITHMS_EEA1");
+            *mme_eeaP = NAS_SECURITY_ALGORITHMS_EEA1;
+    } else if (ue_eeaP & (0x80 >> NAS_SECURITY_ALGORITHMS_EEA0)) {
         LOG_TRACE(DEBUG,"Selected  NAS_SECURITY_ALGORITHMS_EEA0");
         *mme_eeaP = NAS_SECURITY_ALGORITHMS_EEA0;
     } else if (ue_eeaP & (0x80 >> NAS_SECURITY_ALGORITHMS_EEA2)) {
         LOG_TRACE(DEBUG,"Selected  NAS_SECURITY_ALGORITHMS_EEA2");
         *mme_eeaP = NAS_SECURITY_ALGORITHMS_EEA2;
-    } else if (ue_eeaP & (0x80 >> NAS_SECURITY_ALGORITHMS_EEA1)) {
-        LOG_TRACE(DEBUG,"Selected  NAS_SECURITY_ALGORITHMS_EEA1");
-        *mme_eeaP = NAS_SECURITY_ALGORITHMS_EEA1;
     } else {
         LOG_FUNC_RETURN (rc);
     }

openair-cn/NAS/EURECOM-NAS/src/emm/msg/emm_msg.c

@@ -120,7 +120,7 @@ int emm_msg_decode(EMM_msg *msg, uint8_t *buffer, uint32_t len)
     buffer += header_result;
     len -= header_result;
 
-    LOG_TRACE(INFO, "EMM-MSG   - Message Type %02x", msg->header.message_type);
+    LOG_TRACE(INFO, "EMM-MSG   - Message Type 0x%02x", msg->header.message_type);
 
     switch(msg->header.message_type) {
         case EMM_INFORMATION:

openair-cn/NAS/EURECOM-NAS/tools/usim_data.c

@@ -60,7 +60,7 @@ Description	Implements the utility used to generate data stored in the
 #define KSI			USIM_KSI_NOT_AVAILABLE
 #define KSI_ASME		USIM_KSI_NOT_AVAILABLE
 #define INT_ALGO		USIM_INT_EIA1
-#define ENC_ALGO		USIM_ENC_EEA0
+#define ENC_ALGO		USIM_ENC_EEA1
 #define SECURITY_ALGORITHMS	(ENC_ALGO | INT_ALGO)
 
 #define MIN_TAC			0x0000