From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 2 May 2017 14:10:50 +0000 (+0000)
Subject: TKEY values.
X-Git-Tag: release-1.6.4rc1~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93d1d33f3f93a560c4c17da383244b4c47a1d7e8;p=thirdparty%2Funbound.git

TKEY values.


git-svn-id: file:///svn/unbound/trunk@4147 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index 55fa2c766..b73987c5f 100644
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -175,7 +175,7 @@ static const sldns_rdf_type type_tkey_wireformat[] = {
 	LDNS_RDF_TYPE_TIME,
 	LDNS_RDF_TYPE_TIME,
 	LDNS_RDF_TYPE_INT16,
-	LDNS_RDF_TYPE_INT16,
+	LDNS_RDF_TYPE_TSIGERROR,
 	LDNS_RDF_TYPE_INT16_DATA,
 	LDNS_RDF_TYPE_INT16_DATA,
 };
diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index 430399d71..e2246a7b9 100644
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -433,11 +433,14 @@ typedef enum sldns_enum_edns_option sldns_edns_option;
 
 #define LDNS_EDNS_MASK_DO_BIT 0x8000
 
-/** tsig rcodes */
+/** TSIG and TKEY extended rcodes (16bit), 0-15 are the normal rcodes. */
 #define LDNS_TSIG_ERROR_NOERROR  0
 #define LDNS_TSIG_ERROR_BADSIG   16
 #define LDNS_TSIG_ERROR_BADKEY   17
 #define LDNS_TSIG_ERROR_BADTIME  18
+#define LDNS_TSIG_ERROR_BADMODE  19
+#define LDNS_TSIG_ERROR_BADNAME  20
+#define LDNS_TSIG_ERROR_BADALG   21
 
 /**
  * Contains all information about resource record types.
diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index 2e35b2180..ef505780f 100644
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -188,6 +188,9 @@ static sldns_lookup_table sldns_tsig_errors_data[] = {
 	{ LDNS_TSIG_ERROR_BADSIG, "BADSIG" },
 	{ LDNS_TSIG_ERROR_BADKEY, "BADKEY" },
 	{ LDNS_TSIG_ERROR_BADTIME, "BADTIME" },
+	{ LDNS_TSIG_ERROR_BADMODE, "BADMODE" },
+	{ LDNS_TSIG_ERROR_BADNAME, "BADNAME" },
+	{ LDNS_TSIG_ERROR_BADALG, "BADALG" },
 	{ 0, NULL }
 };
 sldns_lookup_table* sldns_tsig_errors = sldns_tsig_errors_data;