aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dns.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-02-19 16:53:20 +0100
committerAnders Broman <a.broman58@gmail.com>2017-02-21 05:47:17 +0000
commitc2589891e3263d1bbc1e3fb4fb2a39b56a749ad7 (patch)
tree3aea39566efbdc2018c72c5d1ad4b179b4faf309 /epan/dissectors/packet-dns.c
parentc5ce5a835a1447f33fccf7e2719541a8edf78ff0 (diff)
DNS: Add Edwards-Curve Digital Security Algorithm (EdDSA) for DNSSEC (RFC 8080)
Change-Id: I39a8c6639174e73f90bc4c3d8bccf628c3a477c3 Reviewed-on: https://code.wireshark.org/review/20179 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dns.c')
-rw-r--r--epan/dissectors/packet-dns.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 8cbc7d578a..c8a3408e90 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -1608,7 +1608,7 @@ dissect_type_bitmap_nxt(proto_tree *rr_tree, tvbuff_t *tvb, int cur_offset, int
}
/*
* SIG, KEY, and CERT RR algorithms.
- * http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.txt (last updated 2012-04-13)
+ * http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.txt (last updated 2017-01-09)
*/
#define DNS_ALGO_RSAMD5 1 /* RSA/MD5 */
#define DNS_ALGO_DH 2 /* Diffie-Hellman */
@@ -1622,6 +1622,8 @@ dissect_type_bitmap_nxt(proto_tree *rr_tree, tvbuff_t *tvb, int cur_offset, int
#define DNS_ALGO_ECCGOST 12 /* GOST R 34.10-2001 */
#define DNS_ALGO_ECDSAP256SHA256 13 /* ECDSA Curve P-256 with SHA-256 */
#define DNS_ALGO_ECDSAP386SHA386 14 /* ECDSA Curve P-386 with SHA-386 */
+#define DNS_ALGO_ED25519 15 /* Ed25519 */
+#define DNS_ALGO_ED448 16 /* Ed448 */
#define DNS_ALGO_HMACMD5 157 /* HMAC/MD5 */
#define DNS_ALGO_INDIRECT 252 /* Indirect key */
#define DNS_ALGO_PRIVATEDNS 253 /* Private, domain name */
@@ -1640,6 +1642,8 @@ static const value_string dnssec_algo_vals[] = {
{ DNS_ALGO_ECCGOST, "GOST R 34.10-2001" },
{ DNS_ALGO_ECDSAP256SHA256, "ECDSA Curve P-256 with SHA-256" },
{ DNS_ALGO_ECDSAP386SHA386, "ECDSA Curve P-386 with SHA-386" },
+ { DNS_ALGO_ED25519, "Ed25519" },
+ { DNS_ALGO_ED448, "Ed448" },
{ DNS_ALGO_HMACMD5, "HMAC/MD5" },
{ DNS_ALGO_INDIRECT, "Indirect key" },
{ DNS_ALGO_PRIVATEDNS, "Private, domain name" },