From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Tue, 31 May 2005 10:23:41 +0000 (+0000)
Subject: off-by-one errors
X-Git-Tag: release-0.65~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6ea5aa3ca52dc52316d5d34262867beb87d3078;p=thirdparty%2Fldns.git

off-by-one errors
---

diff --git a/host2str.c b/host2str.c
index 1b3af7f2..6df7d94d 100644
--- a/host2str.c
+++ b/host2str.c
@@ -1062,7 +1062,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1073,7 +1073,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1084,7 +1084,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1095,7 +1095,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1106,7 +1106,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1117,7 +1117,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1128,7 +1128,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
@@ -1139,7 +1139,7 @@ ldns_key2buffer_str(ldns_buffer *output, ldns_key *k)
 				if (i > LDNS_MAX_KEYLEN) {
 					goto error;
 				}
-				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i + 1, bignum);
+				b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignum);
 				if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
 					goto error;
 				}
diff --git a/keys.c b/keys.c
index 72a03b40..c4c3b0dd 100644
--- a/keys.c
+++ b/keys.c
@@ -648,7 +648,7 @@ ldns_key2rr(ldns_key *k)
 			break;
 	}
 	/* fourth the key bin material */
-	keybin = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, size + 1, bin);
+	keybin = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, size, bin);
 	LDNS_FREE(bin);
 	ldns_rr_push_rdf(pubkey, keybin);
 	return pubkey;