upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 19:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libdns refactoring: get rid of multiple versions of dns_xfrin_create, dst_key_generate, dst_lib_init and dst_context_create

Browse source
This commit is contained in:
Witold Kręcicki 2018-04-04 09:44:50 +02:00
parent ef0e68bfc3
commit 702c022016
37 changed files with 106 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/confgen/keygen.c
View file

@ -170,12 +170,12 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
entropy_flags = ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY;
DO("initialize dst library", dst_lib_init(mctx, ectx, entropy_flags));
DO("initialize dst library", dst_lib_init(mctx, ectx, NULL, entropy_flags));
DO("generate key", dst_key_generate(dns_rootname, alg,
keysize, 0, 0,
DNS_KEYPROTO_ANY,
dns_rdataclass_in, mctx, &key));
keysize, 0, 0, DNS_KEYPROTO_ANY,
dns_rdataclass_in, mctx, &key,
NULL));
isc_buffer_init(&key_rawbuffer, &key_rawsecret, sizeof(key_rawsecret));

2
bin/dig/dighost.c
View file

@ -1400,7 +1400,7 @@ setup_libs(void) {
result = isc_entropy_create(mctx, &entp);
check_result(result, "isc_entropy_create");
result = dst_lib_init(mctx, entp, 0);
result = dst_lib_init(mctx, entp, NULL, 0);
check_result(result, "dst_lib_init");
is_dst_up = ISC_TRUE;

2
bin/dnssec/dnssec-cds.c
View file

@ -1237,7 +1237,7 @@ main(int argc, char *argv[]) {
if (ectx == NULL) {
setup_entropy(mctx, NULL, &ectx);
}
result = dst_lib_init(mctx, ectx,
result = dst_lib_init(mctx, ectx, NULL,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS) {
fatal("could not initialize dst: %s",

2
bin/dnssec/dnssec-dsfromkey.c
View file

@ -479,7 +479,7 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
result = dst_lib_init(mctx, ectx,
result = dst_lib_init(mctx, ectx, NULL,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",

2
bin/dnssec/dnssec-importkey.c
View file

@ -408,7 +408,7 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
result = dst_lib_init(mctx, ectx,
result = dst_lib_init(mctx, ectx, NULL,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",

4
bin/dnssec/dnssec-keyfromlabel.c
View file

@ -349,8 +349,8 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
ret = dst_lib_init2(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
ret = dst_lib_init(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (ret != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(ret));

16
bin/dnssec/dnssec-keygen.c
View file

@ -496,8 +496,8 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
ret = dst_lib_init2(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
ret = dst_lib_init(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (ret != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(ret));
@ -862,15 +862,15 @@ main(int argc, char **argv) {
if (!quiet && show_progress) {
fprintf(stderr, "Generating key pair.");
ret = dst_key_generate2(name, alg, size, param, flags,
protocol, rdclass, mctx, &key,
&progress);
ret = dst_key_generate(name, alg, size, param, flags,
protocol, rdclass, mctx, &key,
&progress);
putc('\n', stderr);
fflush(stderr);
} else {
ret = dst_key_generate2(name, alg, size, param, flags,
protocol, rdclass, mctx, &key,
NULL);
ret = dst_key_generate(name, alg, size, param, flags,
protocol, rdclass, mctx, &key,
NULL);
}
isc_entropy_stopcallbacksources(ectx);

4
bin/dnssec/dnssec-revoke.c
View file

@ -182,8 +182,8 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
result = dst_lib_init2(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
result = dst_lib_init(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS)
fatal("Could not initialize dst: %s",
isc_result_totext(result));

4
bin/dnssec/dnssec-settime.c
View file

@ -380,8 +380,8 @@ main(int argc, char **argv) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
result = dst_lib_init2(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
result = dst_lib_init(mctx, ectx, engine,
ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY);
if (result != ISC_R_SUCCESS)
fatal("Could not initialize dst: %s",
isc_result_totext(result));

2
bin/dnssec/dnssec-signzone.c
View file

@ -3505,7 +3505,7 @@ main(int argc, char *argv[]) {
if (!pseudorandom)
eflags |= ISC_ENTROPY_GOODONLY;
result = dst_lib_init2(mctx, ectx, engine, eflags);
result = dst_lib_init(mctx, ectx, engine, eflags);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(result));

2
bin/dnssec/dnssec-verify.c
View file

@ -281,7 +281,7 @@ main(int argc, char *argv[]) {
if (ectx == NULL)
setup_entropy(mctx, NULL, &ectx);
result = dst_lib_init2(mctx, ectx, engine, ISC_ENTROPY_BLOCKING);
result = dst_lib_init(mctx, ectx, engine, ISC_ENTROPY_BLOCKING);
if (result != ISC_R_SUCCESS)
fatal("could not initialize dst: %s",
isc_result_totext(result));

6
bin/named/server.c
View file

@ -6820,7 +6820,7 @@ generate_session_key(const char *filename, const char *keynamestr,
/* generate key */
result = dst_key_generate(keyname, algtype, bits, 1, 0,
DNS_KEYPROTO_ANY, dns_rdataclass_in,
mctx, &key);
mctx, &key, NULL);
if (result != ISC_R_SUCCESS)
return (result);
@ -9424,8 +9424,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
server->in_roothints = NULL;
/* Must be first. */
CHECKFATAL(dst_lib_init2(named_g_mctx, named_g_entropy,
named_g_engine, ISC_ENTROPY_GOODONLY),
CHECKFATAL(dst_lib_init(named_g_mctx, named_g_entropy,
named_g_engine, ISC_ENTROPY_GOODONLY),
"initializing DST");
CHECKFATAL(dns_rootns_create(mctx, dns_rdataclass_in, NULL,

2
bin/nsupdate/nsupdate.c
View file

@ -989,7 +989,7 @@ setup_system(void) {
result = isc_task_onshutdown(global_task, shutdown_program, NULL);
check_result(result, "isc_task_onshutdown");
result = dst_lib_init(gmctx, entropy, 0);
result = dst_lib_init(gmctx, entropy, NULL, 0);
check_result(result, "dst_lib_init");
is_dst_up = ISC_TRUE;

2
bin/tests/makejournal.c
View file

@ -101,7 +101,7 @@ main(int argc, char **argv) {
CHECK(isc_mem_create(0, 0, &mctx));
CHECK(isc_entropy_create(mctx, &ectx));
CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
CHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_BLOCKING));
dst_active = ISC_TRUE;
CHECK(isc_log_create(mctx, &lctx, &logconfig));

13
bin/tests/optional/dst_test.c
View file

@ -52,8 +52,8 @@ use(dst_key_t *key, isc_mem_t *mctx) {
isc_buffer_add(&databuf, strlen(data));
isc_buffer_usedregion(&databuf, &datareg);
ret = dst_context_create3(key, mctx,
DNS_LOGCATEGORY_GENERAL, ISC_TRUE, &ctx);
ret = dst_context_create(key, mctx,
DNS_LOGCATEGORY_GENERAL, ISC_TRUE, 0, &ctx);
if (ret != ISC_R_SUCCESS) {
printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
isc_result_totext(ret));
@ -73,8 +73,8 @@ use(dst_key_t *key, isc_mem_t *mctx) {
isc_buffer_forward(&sigbuf, 1);
isc_buffer_remainingregion(&sigbuf, &sigreg);
ret = dst_context_create3(key, mctx,
DNS_LOGCATEGORY_GENERAL, ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx,
DNS_LOGCATEGORY_GENERAL, ISC_FALSE, 0, &ctx);
if (ret != ISC_R_SUCCESS) {
printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
isc_result_totext(ret));
@ -214,7 +214,7 @@ generate(int alg, isc_mem_t *mctx) {
dst_key_t *key = NULL;
ret = dst_key_generate(dns_rootname, alg, 512, 0, 0, 0,
dns_rdataclass_in, mctx, &key);
dns_rdataclass_in, mctx, &key, NULL);
printf("generate(%d) returned: %s\n", alg, isc_result_totext(ret));
if (ret != ISC_R_SUCCESS)
return;
@ -254,7 +254,8 @@ main(void) {
result = isc_entropy_createfilesource(ectx, "randomfile");
if (result != ISC_R_SUCCESS)
return (1);
dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
dst_lib_init(mctx, ectx, NULL,
ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);

2
bin/tests/optional/gsstest.c
View file

@ -475,7 +475,7 @@ main(int argc, char *argv[]) {
RUNCHECK(isc_entropy_create(mctx, &ectx));
RUNCHECK(isc_entropy_createfilesource(ectx, "/dev/urandom"));
RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
RUNCHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_GOODONLY));
taskmgr = NULL;
RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));

2
bin/tests/optional/sig0_test.c
View file

@ -225,7 +225,7 @@ main(int argc, char *argv[]) {
}
RUNTIME_CHECK(isc_entropy_create(mctx, &ent) == ISC_R_SUCCESS);
RUNTIME_CHECK(dst_lib_init(mctx, ent, 0) == ISC_R_SUCCESS);
RUNTIME_CHECK(dst_lib_init(mctx, ent, NULL, 0) == ISC_R_SUCCESS);
dns_result_register();
dst_result_register();

2
bin/tests/system/pipelined/pipequeries.c
View file

@ -286,7 +286,7 @@ main(int argc, char *argv[]) {
if (randomfile != NULL)
RUNCHECK(isc_entropy_createfilesource(ectx, randomfile));
RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
RUNCHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_GOODONLY));
taskmgr = NULL;
RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));

2
bin/tests/system/rsabigexponent/bigkey.c
View file

@ -192,7 +192,7 @@ main(int argc, char **argv) {
"../random.data",
ISC_ENTROPY_KEYBOARDNO),
"isc_entropy_usebestsource(\"../random.data\")");
CHECK(dst_lib_init2(mctx, ectx, NULL, 0), "dst_lib_init2()");
CHECK(dst_lib_init(mctx, ectx, NULL, 0), "dst_lib_init()");
CHECK(isc_log_create(mctx, &log_, &logconfig), "isc_log_create()");
isc_log_setcontext(log_);
dns_log_init(log_);

2
bin/tests/system/tkey/keycreate.c
View file

@ -264,7 +264,7 @@ main(int argc, char *argv[]) {
logconfig = NULL;
RUNCHECK(isc_log_create(mctx, &log, &logconfig));
RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
RUNCHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_GOODONLY));
taskmgr = NULL;
RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));

2
bin/tests/system/tkey/keydelete.c
View file

@ -195,7 +195,7 @@ main(int argc, char **argv) {
logconfig = NULL;
RUNCHECK(isc_log_create(mctx, &log, &logconfig));
RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
RUNCHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_GOODONLY));
taskmgr = NULL;
RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr));

2
bin/tools/mdig.c
View file

@ -1934,7 +1934,7 @@ main(int argc, char *argv[]) {
ectx = NULL;
RUNCHECK(isc_entropy_create(mctx, &ectx));
RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
RUNCHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_GOODONLY));
RUNCHECK(isc_entropy_getdata(ectx, cookie_secret,
sizeof(cookie_secret), NULL, 0));

16
lib/dns/dnssec.c
View file

@ -268,8 +268,8 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
if (ret != ISC_R_SUCCESS)
goto cleanup_databuf;
ret = dst_context_create3(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_TRUE, &ctx);
ret = dst_context_create(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_TRUE, 0, &ctx);
if (ret != ISC_R_SUCCESS)
goto cleanup_databuf;
@ -455,8 +455,8 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
}
again:
ret = dst_context_create4(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, maxbits, &ctx);
ret = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, maxbits, &ctx);
if (ret != ISC_R_SUCCESS)
goto cleanup_struct;
@ -919,8 +919,8 @@ dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) {
isc_buffer_init(&databuf, data, sizeof(data));
RETERR(dst_context_create3(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_TRUE, &ctx));
RETERR(dst_context_create(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_TRUE, 0, &ctx));
/*
* Digest the fields of the SIG - we can cheat and use
@ -1068,8 +1068,8 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg,
goto failure;
}
RETERR(dst_context_create3(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_FALSE, &ctx));
RETERR(dst_context_create(key, mctx,
DNS_LOGCATEGORY_DNSSEC, ISC_FALSE, 0, &ctx));
/*
* Digest the SIG(0) record, except for the signature.

52
lib/dns/dst_api.c
View file

@ -148,13 +148,8 @@ default_memfree(void *arg, void *ptr) {
#endif
isc_result_t
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags) {
return (dst_lib_init2(mctx, ectx, NULL, eflags));
}
isc_result_t
dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
const char *engine, unsigned int eflags) {
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx,
const char *engine, unsigned int eflags) {
isc_result_t result;
REQUIRE(mctx != NULL);
@ -339,31 +334,9 @@ dst_ds_digest_supported(unsigned int digest_type) {
}
isc_result_t
dst_context_create(dst_key_t *key, isc_mem_t *mctx, dst_context_t **dctxp) {
return (dst_context_create4(key, mctx, DNS_LOGCATEGORY_GENERAL,
ISC_TRUE, 0, dctxp));
}
isc_result_t
dst_context_create2(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, dst_context_t **dctxp)
{
return (dst_context_create4(key, mctx, category, ISC_TRUE, 0, dctxp));
}
isc_result_t
dst_context_create3(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
dst_context_t **dctxp)
{
return (dst_context_create4(key, mctx, category,
useforsigning, 0, dctxp));
}
isc_result_t
dst_context_create4(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
int maxbits, dst_context_t **dctxp)
dst_context_create(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
int maxbits, dst_context_t **dctxp)
{
dst_context_t *dctx;
isc_result_t result;
@ -983,19 +956,8 @@ dst_key_generate(const dns_name_t *name, unsigned int alg,
unsigned int bits, unsigned int param,
unsigned int flags, unsigned int protocol,
dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp)
{
return (dst_key_generate2(name, alg, bits, param, flags, protocol,
rdclass, mctx, keyp, NULL));
}
isc_result_t
dst_key_generate2(const dns_name_t *name, unsigned int alg,
unsigned int bits, unsigned int param,
unsigned int flags, unsigned int protocol,
dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp,
void (*callback)(int))
isc_mem_t *mctx, dst_key_t **keyp,
void (*callback)(int))
{
dst_key_t *key;
isc_result_t ret;

29
lib/dns/include/dns/xfrin.h
View file

@ -46,31 +46,14 @@ typedef struct dns_xfrin_ctx dns_xfrin_ctx_t;
ISC_LANG_BEGINDECLS
/*% see dns_xfrin_create2() */
isc_result_t
dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey,
isc_mem_t *mctx, isc_timermgr_t *timermgr,
isc_socketmgr_t *socketmgr, isc_task_t *task,
dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp);
isc_result_t
dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp);
isc_result_t
dns_xfrin_create3(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp);
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp);
/*%<
* Attempt to start an incoming zone transfer of 'zone'
* from 'masteraddr', creating a dns_xfrin_ctx_t object to

37
lib/dns/include/dst/dst.h
View file

@ -128,13 +128,9 @@ typedef struct dst_context dst_context_t;
/***
*** Functions
***/
isc_result_t
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx, unsigned int eflags);
isc_result_t
dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx,
const char *engine, unsigned int eflags);
dst_lib_init(isc_mem_t *mctx, isc_entropy_t *ectx,
const char *engine, unsigned int eflags);
/*%<
* Initializes the DST subsystem.
*
@ -196,21 +192,9 @@ dst_ds_digest_supported(unsigned int digest_type);
*/
isc_result_t
dst_context_create(dst_key_t *key, isc_mem_t *mctx, dst_context_t **dctxp);
isc_result_t
dst_context_create2(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, dst_context_t **dctxp);
isc_result_t
dst_context_create3(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
dst_context_t **dctxp);
isc_result_t
dst_context_create4(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
int maxbits, dst_context_t **dctxp);
dst_context_create(dst_key_t *key, isc_mem_t *mctx,
isc_logcategory_t *category, isc_boolean_t useforsigning,
int maxbits, dst_context_t **dctxp);
/*%<
* Creates a context to be used for a sign or verify operation.
*
@ -583,15 +567,8 @@ dst_key_generate(const dns_name_t *name, unsigned int alg,
unsigned int bits, unsigned int param,
unsigned int flags, unsigned int protocol,
dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp);
isc_result_t
dst_key_generate2(const dns_name_t *name, unsigned int alg,
unsigned int bits, unsigned int param,
unsigned int flags, unsigned int protocol,
dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp,
void (*callback)(int));
isc_mem_t *mctx, dst_key_t **keyp,
void (*callback)(int));
/*%<
* Generate a DST key (or keypair) with the supplied parameters. The

2
lib/dns/lib.c
View file

@ -91,7 +91,7 @@ initialize(void) {
if (result != ISC_R_SUCCESS)
goto cleanup_db;
result = dst_lib_init(dns_g_mctx, ectx, 0);
result = dst_lib_init(dns_g_mctx, ectx, NULL, 0);
if (result != ISC_R_SUCCESS)
goto cleanup_ectx;

2
lib/dns/tests/dnstest.c
View file

@ -120,7 +120,7 @@ dns_test_begin(FILE *logfile, isc_boolean_t start_managers) {
CHECK(isc_mem_create(0, 0, &mctx));
CHECK(isc_entropy_create(mctx, &ectx));
CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
CHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_BLOCKING));
dst_active = ISC_TRUE;
if (logfile != NULL) {

4
lib/dns/tests/dst_test.c
View file

@ -177,8 +177,8 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname,
*/
isc_buffer_remainingregion(&sigbuf, &sigreg);
result = dst_context_create3(key, mctx, DNS_LOGCATEGORY_GENERAL,
ISC_FALSE, &ctx);
result = dst_context_create(key, mctx, DNS_LOGCATEGORY_GENERAL,
ISC_FALSE, 0, &ctx);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = dst_context_adddata(ctx, &datareg);

2
lib/dns/tests/dstrandom_test.c
View file

@ -48,7 +48,7 @@ ATF_TC_BODY(isc_entropy_getdata, tc) {
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_entropy_create(mctx, &ectx);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = dst_lib_init(mctx, ectx, 0);
result = dst_lib_init(mctx, ectx, NULL, 0);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
#ifdef ISC_PLATFORM_CRYPTORANDOM

16
lib/dns/tests/rsa_test.c
View file

@ -208,8 +208,8 @@ ATF_TC_BODY(isc_rsa_verify, tc) {
/* RSASHA1 */
ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &ctx);
ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS);
r.base = d;
@ -229,8 +229,8 @@ ATF_TC_BODY(isc_rsa_verify, tc) {
#ifndef PK11_MD5_DISABLE
key->key_alg = DST_ALG_RSAMD5;
ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &ctx);
ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS);
r.base = d;
@ -250,8 +250,8 @@ ATF_TC_BODY(isc_rsa_verify, tc) {
key->key_alg = DST_ALG_RSASHA256;
ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &ctx);
ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS);
r.base = d;
@ -270,8 +270,8 @@ ATF_TC_BODY(isc_rsa_verify, tc) {
key->key_alg = DST_ALG_RSASHA512;
ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &ctx);
ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS);
r.base = d;

4
lib/dns/tests/tsig_test.c
View file

@ -357,8 +357,8 @@ ATF_TC_BODY(tsig_tcp, tc) {
isc_buffer_free(&buf);
dns_message_destroy(&msg);
result = dst_context_create3(key->key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &outctx);
result = dst_context_create(key->key, mctx, DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &outctx);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
ATF_REQUIRE(outctx != NULL);

18
lib/dns/tsig.c
View file

@ -850,9 +850,9 @@ dns_tsig_sign(dns_message_t *msg) {
* has validated at this point. This is why we include a
* MAC length > 0 in the reply.
*/
ret = dst_context_create3(key->key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_TRUE, &ctx);
ret = dst_context_create(key->key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_TRUE, 0, &ctx);
if (ret != ISC_R_SUCCESS)
return (ret);
@ -1235,9 +1235,9 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
sig_r.base = tsig.signature;
sig_r.length = tsig.siglen;
ret = dst_context_create3(key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &ctx);
ret = dst_context_create(key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &ctx);
if (ret != ISC_R_SUCCESS)
return (ret);
@ -1531,9 +1531,9 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
}
if (msg->tsigctx == NULL) {
ret = dst_context_create3(key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, &msg->tsigctx);
ret = dst_context_create(key, mctx,
DNS_LOGCATEGORY_DNSSEC,
ISC_FALSE, 0, &msg->tsigctx);
if (ret != ISC_R_SUCCESS)
goto cleanup_querystruct;

7
lib/dns/win32/libdns.def.in
View file

@ -1109,8 +1109,6 @@ dns_viewlist_find
dns_viewlist_findzone
dns_xfrin_attach
dns_xfrin_create
dns_xfrin_create2
dns_xfrin_create3
dns_xfrin_detach
dns_xfrin_shutdown
dns_zone_addnsec3chain
@ -1357,9 +1355,6 @@ dns_zt_unmount
dst_algorithm_supported
dst_context_adddata
dst_context_create
dst_context_create2
dst_context_create3
dst_context_create4
dst_context_destroy
dst_context_sign
dst_context_verify
@ -1390,7 +1385,6 @@ dst_key_fromgssapi
dst_key_fromlabel
dst_key_fromnamedfile
dst_key_generate
dst_key_generate2
dst_key_getbits
dst_key_getfilename
dst_key_getgssctx
@ -1431,7 +1425,6 @@ dst_key_unsetnum
dst_key_unsettime
dst_lib_destroy
dst_lib_init
dst_lib_init2
dst_lib_initmsgcat
@IF PKCS11
dst_random_getdata

54
lib/dns/xfrin.c
View file

@ -630,54 +630,12 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
isc_result_t
dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey,
isc_mem_t *mctx, isc_timermgr_t *timermgr,
isc_socketmgr_t *socketmgr, isc_task_t *task,
dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp)
{
isc_sockaddr_t sourceaddr;
isc_dscp_t dscp;
switch (isc_sockaddr_pf(masteraddr)) {
case PF_INET:
sourceaddr = *dns_zone_getxfrsource4(zone);
dscp = dns_zone_getxfrsource4dscp(zone);
break;
case PF_INET6:
sourceaddr = *dns_zone_getxfrsource6(zone);
dscp = dns_zone_getxfrsource6dscp(zone);
break;
default:
INSIST(0);
}
return(dns_xfrin_create3(zone, xfrtype, masteraddr, &sourceaddr,
dscp, tsigkey, mctx, timermgr, socketmgr,
task, done, xfrp));
}
isc_result_t
dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp)
{
return (dns_xfrin_create3(zone, xfrtype, masteraddr, sourceaddr, -1,
tsigkey, mctx, timermgr, socketmgr, task,
done, xfrp));
}
isc_result_t
dns_xfrin_create3(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp)
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *sourceaddr,
isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
isc_task_t *task, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp)
{
dns_name_t *zonename = dns_zone_getorigin(zone);
dns_xfrin_ctx_t *xfr = NULL;

8
lib/dns/zone.c
View file

@ -15546,10 +15546,10 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
};
UNLOCK_ZONE(zone);
INSIST(isc_sockaddr_pf(&masteraddr) == isc_sockaddr_pf(&sourceaddr));
result = dns_xfrin_create3(zone, xfrtype, &masteraddr, &sourceaddr,
dscp, zone->tsigkey, zone->mctx,
zone->zmgr->timermgr, zone->zmgr->socketmgr,
zone->task, zone_xfrdone, &zone->xfr);
result = dns_xfrin_create(zone, xfrtype, &masteraddr, &sourceaddr,
dscp, zone->tsigkey, zone->mctx,
zone->zmgr->timermgr, zone->zmgr->socketmgr,
zone->task, zone_xfrdone, &zone->xfr);
if (result == ISC_R_SUCCESS) {
LOCK_ZONE(zone);
if (xfrtype == dns_rdatatype_axfr) {

2
lib/ns/tests/nstest.c
View file

@ -245,7 +245,7 @@ ns_test_begin(FILE *logfile, isc_boolean_t start_managers) {
CHECK(isc_mem_create(0, 0, &mctx));
CHECK(isc_entropy_create(mctx, &ectx));
CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
CHECK(dst_lib_init(mctx, ectx, NULL, ISC_ENTROPY_BLOCKING));
dst_active = ISC_TRUE;
if (logfile != NULL) {