Created isc_base64_to{text,buffer} and removed the static versions
from lib/dns/rdata.c.
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: cert_37.c,v 1.7 1999/05/07 03:24:06 marka Exp $ */
|
||||
/* $Id: cert_37.c,v 1.8 1999/05/18 17:46:59 bwelling Exp $ */
|
||||
|
||||
/* draft-ietf-dnssec-certs-04.txt */
|
||||
|
||||
@@ -70,7 +70,7 @@ fromtext_cert(dns_rdataclass_t class, dns_rdatatype_t type,
|
||||
}
|
||||
RETERR(mem_tobuffer(target, &secalg, 1));
|
||||
|
||||
return (base64_tobuffer(lexer, target, -1));
|
||||
return (isc_base64_tobuffer(lexer, target, -1));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
@@ -103,7 +103,7 @@ totext_cert(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) {
|
||||
isc_region_consume(&sr, 1);
|
||||
|
||||
/* cert */
|
||||
return (base64_totext(&sr, target));
|
||||
return (isc_base64_totext(&sr, target));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: key_25.c,v 1.5 1999/05/07 03:24:07 marka Exp $ */
|
||||
/* $Id: key_25.c,v 1.6 1999/05/18 17:46:59 bwelling Exp $ */
|
||||
|
||||
/* RFC 2065 */
|
||||
|
||||
@@ -59,7 +59,7 @@ fromtext_key(dns_rdataclass_t class, dns_rdatatype_t type,
|
||||
if ((flags & 0xc000) == 0xc000)
|
||||
return (DNS_R_SUCCESS);
|
||||
|
||||
return (base64_tobuffer(lexer, target, -1));
|
||||
return (isc_base64_tobuffer(lexer, target, -1));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
@@ -98,7 +98,7 @@ totext_key(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) {
|
||||
|
||||
/* key */
|
||||
RETERR(str_totext(" ", target));
|
||||
return (base64_totext(&sr, target));
|
||||
return (isc_base64_totext(&sr, target));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: sig_24.c,v 1.11 1999/05/07 03:24:11 marka Exp $ */
|
||||
/* $Id: sig_24.c,v 1.12 1999/05/18 17:46:59 bwelling Exp $ */
|
||||
|
||||
/* RFC 2065 */
|
||||
|
||||
@@ -92,7 +92,7 @@ fromtext_sig(dns_rdataclass_t class, dns_rdatatype_t type,
|
||||
RETERR(dns_name_fromtext(&name, &buffer, origin, downcase, target));
|
||||
|
||||
/* sig */
|
||||
return (base64_tobuffer(lexer, target, -1));
|
||||
return (isc_base64_tobuffer(lexer, target, -1));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
@@ -168,7 +168,7 @@ totext_sig(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) {
|
||||
RETERR(str_totext(" ", target));
|
||||
|
||||
/* sig */
|
||||
return (base64_totext(&sr, target));
|
||||
return (isc_base64_totext(&sr, target));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: tkey_249.c,v 1.9 1999/05/07 03:24:12 marka Exp $ */
|
||||
/* $Id: tkey_249.c,v 1.10 1999/05/18 17:46:59 bwelling Exp $ */
|
||||
|
||||
/* draft-ietf-dnssec-tkey-01.txt */
|
||||
|
||||
@@ -80,7 +80,7 @@ fromtext_tkey(dns_rdataclass_t class, dns_rdatatype_t type,
|
||||
RETERR(uint16_tobuffer(token.value.as_ulong, target));
|
||||
|
||||
/* Signature */
|
||||
RETERR(base64_tobuffer(lexer, target, token.value.as_ulong));
|
||||
RETERR(isc_base64_tobuffer(lexer, target, token.value.as_ulong));
|
||||
|
||||
/* Other Len */
|
||||
RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE));
|
||||
@@ -89,7 +89,7 @@ fromtext_tkey(dns_rdataclass_t class, dns_rdatatype_t type,
|
||||
RETERR(uint16_tobuffer(token.value.as_ulong, target));
|
||||
|
||||
/* Other Data */
|
||||
return (base64_tobuffer(lexer, target, token.value.as_ulong));
|
||||
return (isc_base64_tobuffer(lexer, target, token.value.as_ulong));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
@@ -153,7 +153,7 @@ totext_tkey(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) {
|
||||
REQUIRE(n <= sr.length);
|
||||
sigr = sr;
|
||||
sigr.length = n;
|
||||
RETERR(base64_totext(&sigr, target));
|
||||
RETERR(isc_base64_totext(&sigr, target));
|
||||
RETERR(str_totext(" ", target));
|
||||
isc_region_consume(&sr, n);
|
||||
|
||||
@@ -164,7 +164,7 @@ totext_tkey(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) {
|
||||
RETERR(str_totext(buf, target));
|
||||
|
||||
/* Other */
|
||||
return (base64_totext(&sr, target));
|
||||
return (isc_base64_totext(&sr, target));
|
||||
}
|
||||
|
||||
static dns_result_t
|
||||
|
||||
Reference in New Issue
Block a user