Use isc_one_or_more when calling isc_base64_tobuffer

diff --git a/lib/dns/rdata/generic/brid_68.c b/lib/dns/rdata/generic/brid_68.c
index 460aa4f00e2c002aefa55c9cb44db8b9cfc4cf86..cf8b50fba075b89612e61cd2ec215471530580e9 100644 (file)
--- a/lib/dns/rdata/generic/brid_68.c
+++ b/lib/dns/rdata/generic/brid_68.c
@@ -28,7 +28,7 @@ fromtext_brid(ARGS_FROMTEXT) {
        UNUSED(options);
        UNUSED(callbacks);
 
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 138c29670203e2bab82fe33c183c6beaa1ce90c5..d901f44b6318a13117a7810313c7df6d75f96db4 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -58,7 +58,7 @@ fromtext_cert(ARGS_FROMTEXT) {
        RETTOK(dns_secalg_fromtext(&secalg, &token.value.as_textregion));
        RETERR(mem_tobuffer(target, &secalg, 1));
 
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/hhit_67.c b/lib/dns/rdata/generic/hhit_67.c
index 495e2a50fcbc074eacd6e92f47a2af37cd97c250..44331bcfe05f16bcd24753435e11279490fa01a3 100644 (file)
--- a/lib/dns/rdata/generic/hhit_67.c
+++ b/lib/dns/rdata/generic/hhit_67.c
@@ -28,7 +28,7 @@ fromtext_hhit(ARGS_FROMTEXT) {
        UNUSED(options);
        UNUSED(callbacks);
 
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 9d7c95845bbda5bfba3d62849e1f7db6b804b3c2..7ef3663ffee2dee1f07d49598289a084411f81ee 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -115,7 +115,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) {
        /*
         * Public key.
         */
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 38b5a0603303d237c2ccdc343243797ed3f123e6..2c5121242e361c2f062d5242a47702cb25636c1d 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -89,7 +89,7 @@ generic_fromtext_key(ARGS_FROMTEXT) {
         */
        used = isc_buffer_usedlength(target);
 
-       RETERR(isc_base64_tobuffer(lexer, target, -2));
+       RETERR(isc_base64_tobuffer(lexer, target, isc_one_or_more));
 
        if (alg == DNS_KEYALG_PRIVATEDNS || alg == DNS_KEYALG_PRIVATEOID) {
                isc_buffer_t b;

diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 2a5d78cc232a772428a2ebc36afc3835263a23a1..ee8cf0307a3dfffb41dbafb87c586cdae35219a3 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -83,7 +83,7 @@ fromtext_keydata(ARGS_FROMTEXT) {
                return ISC_R_SUCCESS;
        }
 
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index 9ccfaeef75c897d02fb80e6bd8466dc1d41b6cfd..74e3147ecaac0060e93848444d5555c565198d07 100644 (file)
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -29,7 +29,7 @@ fromtext_openpgpkey(ARGS_FROMTEXT) {
        /*
         * Keyring.
         */
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index f9980a764649a7643af4a5d44297f03e45ef75ce..647c45b519f60bea9b27ef3269910bb2919f5e6c 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -155,7 +155,7 @@ fromtext_rrsig(ARGS_FROMTEXT) {
         */
        used = isc_buffer_usedlength(target);
 
-       RETERR(isc_base64_tobuffer(lexer, target, -2));
+       RETERR(isc_base64_tobuffer(lexer, target, isc_one_or_more));
 
        if (alg == DNS_KEYALG_PRIVATEDNS || alg == DNS_KEYALG_PRIVATEOID) {
                isc_buffer_t b;

diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 8d95e6320742c1c3348aaf65527ff2c4c35d7542..43286594127737d01c93c34cdbc4dcdf45f4e3d5 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -119,7 +119,7 @@ fromtext_sig(ARGS_FROMTEXT) {
         */
        used = isc_buffer_usedlength(target);
 
-       RETERR(isc_base64_tobuffer(lexer, target, -2));
+       RETERR(isc_base64_tobuffer(lexer, target, isc_one_or_more));
 
        if (alg == DNS_KEYALG_PRIVATEDNS || alg == DNS_KEYALG_PRIVATEOID) {
                isc_buffer_t b;

diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 6f2b9dfb9fee58ac36c6d9bd57592a20367e5c8c..7486ca86bd04789231609fd77e1d1e2538be0c73 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -29,7 +29,7 @@ fromtext_in_dhcid(ARGS_FROMTEXT) {
        UNUSED(options);
        UNUSED(callbacks);
 
-       return isc_base64_tobuffer(lexer, target, -2);
+       return isc_base64_tobuffer(lexer, target, isc_one_or_more);
 }
 
 static isc_result_t