aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-05-06 23:41:26 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2014-05-06 21:43:35 +0000
commit398c81a299760c98dcf18d722cb1239f5e52b7b8 (patch)
tree55eeed90e16a0e955d891ab2ab3ee51f60d0ff79 /epan
parent2e16091845811498d088c5ac0e3c94f21c5e58f1 (diff)
PDCP LTE: add identification of ZUC based security algorithms
Change-Id: I63a66bc5822ac04f1a2bccd3a15adac30b65e397 Reviewed-on: https://code.wireshark.org/review/1541 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-pdcp-lte.c2
-rw-r--r--epan/dissectors/packet-pdcp-lte.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index cbf2bce2f3..02848ebee0 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -412,6 +412,7 @@ static const value_string integrity_algorithm_vals[] = {
{ 0, "EIA0" },
{ 1, "EIA1" },
{ 2, "EIA2" },
+ { 3, "EIA3" },
{ 0, NULL }
};
@@ -419,6 +420,7 @@ static const value_string ciphering_algorithm_vals[] = {
{ 0, "EEA0" },
{ 1, "EEA1" },
{ 2, "EEA2" },
+ { 3, "EEA3" },
{ 0, NULL }
};
diff --git a/epan/dissectors/packet-pdcp-lte.h b/epan/dissectors/packet-pdcp-lte.h
index b1b63b3127..74c6d31614 100644
--- a/epan/dissectors/packet-pdcp-lte.h
+++ b/epan/dissectors/packet-pdcp-lte.h
@@ -53,7 +53,7 @@ typedef enum
#define PDCP_SN_LENGTH_15_BITS 15
enum security_integrity_algorithm_e { eia0, eia1, eia2, eia3 };
-enum security_ciphering_algorithm_e { eea0, eea1, eea2 };
+enum security_ciphering_algorithm_e { eea0, eea1, eea2, eea3 };
typedef struct pdcp_security_info_t
{