aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dns.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2010-12-18 14:29:21 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2010-12-18 14:29:21 +0000
commit4e010eb194e4cb621f0f3473aa1da606557e2498 (patch)
treebc0f640de625e9fd19f233ac864a5c3cfa98bc42 /epan/dissectors/packet-dns.c
parent26ccf66e6034cf0cee49979063b7f55f0a265066 (diff)
From Daniel Black:
Adds support for GOST algorithm as per RFC5933. This is used as an option DNSSEC algorithm. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35217 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dns.c')
-rw-r--r--epan/dissectors/packet-dns.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index f4ea41813d..74abb2de12 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -1075,20 +1075,22 @@ dissect_type_bitmap(proto_tree *rr_tree, tvbuff_t *tvb, int cur_offset, int rr_l
/*
* SIG, KEY, and CERT RR algorithms.
+ * http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.txt
*/
-#define DNS_ALGO_RSAMD5 1 /* RSA/MD5 */
-#define DNS_ALGO_DH 2 /* Diffie-Hellman */
-#define DNS_ALGO_DSA 3 /* DSA */
-#define DNS_ALGO_ECC 4 /* Elliptic curve crypto */
+#define DNS_ALGO_RSAMD5 1 /* RSA/MD5 */
+#define DNS_ALGO_DH 2 /* Diffie-Hellman */
+#define DNS_ALGO_DSA 3 /* DSA */
+#define DNS_ALGO_ECC 4 /* Elliptic curve crypto */
#define DNS_ALGO_RSASHA1 5 /* RSA/SHA1 */
#define DNS_ALGO_DSA_NSEC3_SHA1 6 /* DSA + NSEC3/SHA1 */
#define DNS_ALGO_RSASHA1_NSEC3_SHA1 7 /* RSA/SHA1 + NSEC3/SHA1 */
#define DNS_ALGO_RSASHA256 8 /* RSA/SHA-256 */
#define DNS_ALGO_RSASHA512 10 /* RSA/SHA-512 */
+#define DNS_ALGO_ECCGOST 12 /* GOST R 34.10-2001 */
#define DNS_ALGO_HMACMD5 157 /* HMAC/MD5 */
-#define DNS_ALGO_INDIRECT 252 /* Indirect key */
-#define DNS_ALGO_PRIVATEDNS 253 /* Private, domain name */
-#define DNS_ALGO_PRIVATEOID 254 /* Private, OID */
+#define DNS_ALGO_INDIRECT 252 /* Indirect key */
+#define DNS_ALGO_PRIVATEDNS 253 /* Private, domain name */
+#define DNS_ALGO_PRIVATEOID 254 /* Private, OID */
static const value_string algo_vals[] = {
{ DNS_ALGO_RSAMD5, "RSA/MD5" },
@@ -1100,6 +1102,7 @@ static const value_string algo_vals[] = {
{ DNS_ALGO_RSASHA1_NSEC3_SHA1,"RSA/SHA1 + NSEC3/SHA1" },
{ DNS_ALGO_RSASHA256, "RSA/SHA-256" },
{ DNS_ALGO_RSASHA512, "RSA/SHA-512" },
+ { DNS_ALGO_ECCGOST, "GOST R 34.10-2001" },
{ DNS_ALGO_HMACMD5, "HMAC/MD5" },
{ DNS_ALGO_INDIRECT, "Indirect key" },
{ DNS_ALGO_PRIVATEDNS, "Private, domain name" },