off-by-one errors

diff --git a/host2str.c b/host2str.c
index 1b3af7f2b811021a5d70f38291fd703a89981a85..6df7d94d4082f147dda8a0bbc8eb9e07fef888f6 100644 (file)
--- 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 72a03b40e1359b8bfd917a941eea75b8c4f44b13..c4c3b0ddcd7f21f27d28bf5a76b9da225ca3e7bf 100644 (file)
--- 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;