From 9e1181cf233632e211055e50c86edeb8e7c21fb6 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Tue, 5 Aug 2014 15:55:08 +0000
Subject: [PATCH] security algorithms

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5665 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 openair2/COMMON/as_message.h | 4 ++++
 openair2/COMMON/networkDef.h | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/openair2/COMMON/as_message.h b/openair2/COMMON/as_message.h
index bee1919393..5d84194485 100644
--- a/openair2/COMMON/as_message.h
+++ b/openair2/COMMON/as_message.h
@@ -346,6 +346,8 @@ typedef struct nas_establish_rsp_s {
     nas_error_code_t errCode;      /* Transaction status          */
     as_nas_info_t    nasMsg;       /* NAS message to transfer     */
     UInt32_t         nas_ul_count; /* UL NAS COUNT                */
+    uint16_t         selected_encryption_algorithm;
+    uint16_t         selected_integrity_algorithm;
 } nas_establish_rsp_t;
 
 /*
@@ -357,6 +359,8 @@ typedef struct nas_establish_cnf_s {
     nas_error_code_t errCode;         /* Transaction status          */
     as_nas_info_t    nasMsg;          /* NAS message to transfer     */
     UInt32_t         ul_nas_count;
+    uint16_t         selected_encryption_algorithm;
+    uint16_t         selected_integrity_algorithm;
 } nas_establish_cnf_t;
 
 /*
diff --git a/openair2/COMMON/networkDef.h b/openair2/COMMON/networkDef.h
index 9a00e12d8a..06e7cf655c 100644
--- a/openair2/COMMON/networkDef.h
+++ b/openair2/COMMON/networkDef.h
@@ -148,9 +148,9 @@ Description Contains network's global definitions
  * PDN connection type
  * -------------------
  */
-#define NET_PDN_TYPE_IPV4   0
-#define NET_PDN_TYPE_IPV6   1
-#define NET_PDN_TYPE_IPV4V6 2
+#define NET_PDN_TYPE_IPV4   (0 + 1)
+#define NET_PDN_TYPE_IPV6   (1 + 1)
+#define NET_PDN_TYPE_IPV4V6 (2 + 1)
 
 /****************************************************************************/
 /************************  G L O B A L    T Y P E S  ************************/
-- 
2.26.2