diff --git a/lib/dns/rdata/generic/brid_68.c b/lib/dns/rdata/generic/brid_68.c index ac3bbb35ae..0b05fb3faa 100644 --- 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, -1); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -45,8 +45,6 @@ totext_brid(ARGS_TOTEXT) { RETERR(str_totext(" (", target)); } - RETERR(str_totext(tctx->linebreak, target)); - if (tctx->width == 0) { /* No splitting */ RETERR(isc_base64_totext(&sr, 60, "", target)); } else { diff --git a/lib/dns/rdata/generic/hhit_67.c b/lib/dns/rdata/generic/hhit_67.c index c0b57730e7..1fa869c218 100644 --- 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, -1); + return isc_base64_tobuffer(lexer, target, -2); } static isc_result_t @@ -45,8 +45,6 @@ totext_hhit(ARGS_TOTEXT) { RETERR(str_totext(" (", target)); } - RETERR(str_totext(tctx->linebreak, target)); - if (tctx->width == 0) { /* No splitting */ RETERR(isc_base64_totext(&sr, 60, "", target)); } else { diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index e95cf5cc8f..ff653adc91 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -1102,7 +1102,7 @@ ISC_RUN_TEST_IMPL(amtrelay) { } /* BRIB RDATA - base64 encoded opaque */ -ISC_RUN_TEST_IMPL(brib) { +ISC_RUN_TEST_IMPL(brid) { text_ok_t text_ok[] = { /* empty */ TEXT_INVALID(""), /* valid base64 string */ @@ -3280,6 +3280,7 @@ ISC_TEST_LIST_START ISC_TEST_ENTRY(amtrelay) ISC_TEST_ENTRY(apl) ISC_TEST_ENTRY(atma) +ISC_TEST_ENTRY(brid) ISC_TEST_ENTRY(cdnskey) ISC_TEST_ENTRY(csync) ISC_TEST_ENTRY(dnskey) @@ -3287,6 +3288,7 @@ ISC_TEST_ENTRY(doa) ISC_TEST_ENTRY(ds) ISC_TEST_ENTRY(dsync) ISC_TEST_ENTRY(eid) +ISC_TEST_ENTRY(hhit) ISC_TEST_ENTRY(hip) ISC_TEST_ENTRY(https_svcb) ISC_TEST_ENTRY(isdn) @@ -3296,8 +3298,8 @@ ISC_TEST_ENTRY(nimloc) ISC_TEST_ENTRY(nsec) ISC_TEST_ENTRY(nsec3) ISC_TEST_ENTRY(nxt) -ISC_TEST_ENTRY(rkey) ISC_TEST_ENTRY(resinfo) +ISC_TEST_ENTRY(rkey) ISC_TEST_ENTRY(sshfp) ISC_TEST_ENTRY(wallet) ISC_TEST_ENTRY(wks)