Use isc_one_or_more when calling isc_base64_tobuffer

(cherry picked from commit 62fd89d4a121354c9e77d9429f53998c9d94d678)

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 7b43c5111f730f8942fdfa3fcf2a06c89f4a05c7..c7390891e8b67907f0b3a2c467e43479c927fa5b 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -118,7 +118,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 503e450c3daf18663771c40e10c58b8d657c17af..b30a8dae729a8b5289be60ffea578f7d37772b58 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 9a06a4892d61804c410e66f1956e47c3126f70af..80b6fbc711d91406618513bfa105c8ac14dde1b4 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -157,7 +157,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 fd7487897f7066ed59ab545e2d141a7b6a2d0572..cedf400b7ffe9e6195da7d85e0496945b81aa21a 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -121,7 +121,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