mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

2627. [func] Rationalize dnssec-signzone's signwithkey() calling.

Browse Source 
[RT #19959]
This commit is contained in:
Mark Andrews
2009-07-21 01:22:27 +00:00
parent fd0b768f4c
commit 520cea04a2
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,5 +1,8 @@
--- 9.7.0a2 released --- --- 9.7.0a2 released ---
2627. [func] Rationalize dnssec-signzone's signwithkey() calling.
[RT #19959]
2636. [func] Simplify zone signing and key maintenance with the 2636. [func] Simplify zone signing and key maintenance with the
dnssec-* tools. Major changes: dnssec-* tools. Major changes:
- all dnssec-* tools now take a -K option to - all dnssec-* tools now take a -K option to

55
bin/dnssec/dnssec-signzone.c
View File

@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.223 2009/07/20 12:11:58 fdupont Exp $ */ /* $Id: dnssec-signzone.c,v 1.224 2009/07/21 01:22:27 marka Exp $ */
/*! \file */ /*! \file */
@@ -186,19 +186,29 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) {
check_result(result, "dns_master_dumpnodetostream"); check_result(result, "dns_master_dumpnodetostream");
} }
/*%
* Sign given the RRset with given key, and add the signature record to the
* given tuple.
*/
static void static void
signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata, signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key,
dst_key_t *key) dns_ttl_t ttl, dns_diff_t *add, const char *logmsg)
{ {
isc_result_t result; isc_result_t result;
isc_stdtime_t jendtime; isc_stdtime_t jendtime;
char keystr[KEY_FORMATSIZE];
dns_rdata_t trdata = DNS_RDATA_INIT;
unsigned char array[BUFSIZE]; unsigned char array[BUFSIZE];
isc_buffer_t b; isc_buffer_t b;
dns_difftuple_t *tuple;
key_format(key, keystr, sizeof(keystr));
vbprintf(1, "\t%s %s\n", logmsg, keystr);
jendtime = (jitter != 0) ? isc_random_jitter(endtime, jitter) : endtime; jendtime = (jitter != 0) ? isc_random_jitter(endtime, jitter) : endtime;
isc_buffer_init(&b, array, sizeof(array)); isc_buffer_init(&b, array, sizeof(array));
result = dns_dnssec_sign(name, rdataset, key, &starttime, &jendtime, result = dns_dnssec_sign(name, rdataset, key, &starttime, &jendtime,
mctx, &b, rdata); mctx, &b, &trdata);
isc_entropy_stopcallbacksources(ectx); isc_entropy_stopcallbacksources(ectx);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
char keystr[KEY_FORMATSIZE]; char keystr[KEY_FORMATSIZE];
@@ -210,7 +220,7 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata,
if (tryverify) { if (tryverify) {
result = dns_dnssec_verify(name, rdataset, key, result = dns_dnssec_verify(name, rdataset, key,
ISC_TRUE, mctx, rdata); ISC_TRUE, mctx, &trdata);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
vbprintf(3, "\tsignature verified\n"); vbprintf(3, "\tsignature verified\n");
INCSTAT(nverified); INCSTAT(nverified);
@@ -219,6 +229,12 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata,
INCSTAT(nverifyfailed); INCSTAT(nverifyfailed);
} }
} }
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD, name, ttl, &trdata,
&tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(add, &tuple);
} }
static inline isc_boolean_t static inline isc_boolean_t
@@ -527,21 +543,11 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name,
} }
if (resign) { if (resign) {
dns_rdata_t trdata = DNS_RDATA_INIT;
char keystr[KEY_FORMATSIZE];
INSIST(!keep); INSIST(!keep);
key_format(key->key, keystr, sizeof(keystr)); signwithkey(name, set, key->key, ttl, add,
vbprintf(1, "\tresigning with dnskey %s\n", keystr); "resigning with dnskey");
signwithkey(name, set, &trdata, key->key);
nowsignedby[key->index] = ISC_TRUE; nowsignedby[key->index] = ISC_TRUE;
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
name, ttl, &trdata,
&tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(add, &tuple);
} }
dns_rdata_reset(&sigrdata); dns_rdata_reset(&sigrdata);
@@ -559,9 +565,6 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name,
key != NULL; key != NULL;
key = ISC_LIST_NEXT(key, link)) key = ISC_LIST_NEXT(key, link))
{ {
dns_rdata_t trdata;
char keystr[KEY_FORMATSIZE];
if (nowsignedby[key->index]) if (nowsignedby[key->index])
continue; continue;
@@ -571,16 +574,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name,
if (iszsk(key) || if (iszsk(key) ||
(isksk(key) && set->type == dns_rdatatype_dnskey && (isksk(key) && set->type == dns_rdatatype_dnskey &&
dns_name_equal(name, gorigin))) { dns_name_equal(name, gorigin))) {
key_format(key->key, keystr, sizeof(keystr)); signwithkey(name, set, key->key, ttl, add,
vbprintf(1, "\tsigning with dnskey %s\n", keystr); "signing with dnskey");
dns_rdata_init(&trdata);
signwithkey(name, set, &trdata, key->key);
tuple = NULL;
result = dns_difftuple_create(mctx, DNS_DIFFOP_ADD,
name, ttl, &trdata,
&tuple);
check_result(result, "dns_difftuple_create");
dns_diff_append(add, &tuple);
} }
} }