aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-03-12 14:29:10 +0100
committerAnders Broman <a.broman58@gmail.com>2015-03-12 16:24:43 +0000
commitcaebab58ffbd6249ce43c098ac6e081ee1828117 (patch)
treea1304643163e7efac14d5b728ec6f1cb51fe2b15 /epan
parentca9508a2897caa0e61238dcc1026390b349cee34 (diff)
DNS: SSHFP Update Algo and fingertype
Change-Id: I78376c5578ee1f1871260db478a9c0d994f5bd38 RFC6594: Use of the SHA-256 Algorithm with RSA, Digital Signature Algorithm (DSA), and Elliptic Curve DSA (ECDSA) in SSHFP Resource Records RFC7479: Using Ed25519 in SSHFP Resource Records Reviewed-on: https://code.wireshark.org/review/7654 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-dns.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index b3789213f6..ff147a24ae 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -737,20 +737,26 @@ static const value_string tkey_mode_vals[] = {
#define TSSHFP_ALGO_RESERVED (0)
#define TSSHFP_ALGO_RSA (1)
#define TSSHFP_ALGO_DSA (2)
+#define TSSHFP_ALGO_ECDSA (3)
+#define TSSHFP_ALGO_ED25519 (4)
#define TSSHFP_FTYPE_RESERVED (0)
#define TSSHFP_FTYPE_SHA1 (1)
+#define TSSHFP_FTYPE_SHA256 (2)
static const value_string sshfp_algo_vals[] = {
{ TSSHFP_ALGO_RESERVED, "Reserved" },
{ TSSHFP_ALGO_RSA, "RSA" },
{ TSSHFP_ALGO_DSA, "DSA" },
+ { TSSHFP_ALGO_ECDSA, "ECDSA" },
+ { TSSHFP_ALGO_ED25519, "Ed25519" },
{ 0, NULL }
};
static const value_string sshfp_fingertype_vals[] = {
{ TSSHFP_FTYPE_RESERVED, "Reserved" },
{ TSSHFP_FTYPE_SHA1, "SHA1" },
+ { TSSHFP_FTYPE_SHA256, "SHA256" },
{ 0, NULL }
};