dnssec-signzone.c 30.9 KB
Newer Older
Michael Graff's avatar
Michael Graff committed
1
/*
Bob Halley's avatar
Bob Halley committed
2
 * Copyright (C) 1999, 2000  Internet Software Consortium.
Bob Halley's avatar
Bob Halley committed
3
 * 
Michael Graff's avatar
Michael Graff committed
4 5 6
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
Bob Halley's avatar
Bob Halley committed
7
 * 
Michael Graff's avatar
Michael Graff committed
8 9 10 11 12 13 14 15 16
 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 * SOFTWARE.
 */
Brian Wellington's avatar
Brian Wellington committed
17 18 19 20 21 22 23 24 25

#include <config.h>

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <isc/types.h>
#include <isc/assertions.h>
26
#include <isc/commandline.h>
27
#include <isc/boolean.h>
Brian Wellington's avatar
Brian Wellington committed
28 29 30 31
#include <isc/buffer.h>
#include <isc/error.h>
#include <isc/mem.h>
#include <isc/stdtime.h>
32
#include <isc/list.h>
Brian Wellington's avatar
Brian Wellington committed
33 34 35 36 37 38 39 40 41 42

#include <dns/types.h>
#include <dns/name.h>
#include <dns/fixedname.h>
#include <dns/db.h>
#include <dns/dbiterator.h>
#include <dns/rdata.h>
#include <dns/rdatalist.h>
#include <dns/rdataset.h>
#include <dns/rdatasetiter.h>
43
#include <dns/rdatastruct.h>
44
#include <dns/rdatatype.h>
Brian Wellington's avatar
Brian Wellington committed
45 46 47
#include <dns/result.h>
#include <dns/dnssec.h>
#include <dns/keyvalues.h>
48
#include <dns/secalg.h>
49
#include <dns/nxt.h>
50
#include <dns/time.h>
51
#include <dns/zone.h>
52
#include <dns/log.h>
Brian Wellington's avatar
Brian Wellington committed
53 54 55

#include <dst/dst.h>

56
#define BUFSIZE 2048
Brian Wellington's avatar
Brian Wellington committed
57 58 59
#define is_zone_key(key) ((dst_key_flags(key) & DNS_KEYFLAG_OWNERMASK) \
			  == DNS_KEYOWNER_ZONE)

60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
typedef struct signer_key_struct signer_key_t;
typedef struct signer_array_struct signer_array_t;

struct signer_key_struct {
	dst_key_t *key;
	isc_boolean_t isdefault;
	ISC_LINK(signer_key_t) link;
};

struct signer_array_struct {
	unsigned char array[BUFSIZE];
	ISC_LINK(signer_array_t) link;
};

ISC_LIST(signer_key_t) keylist;
75
isc_stdtime_t starttime = 0, endtime = 0, now;
76
int cycle = -1;
77
int verbose;
78

Brian Wellington's avatar
Brian Wellington committed
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
static isc_mem_t *mctx = NULL;

static inline void
fatal(char *message) {
	fprintf(stderr, "%s\n", message);
	exit(1);
}

static inline void
check_result(isc_result_t result, char *message) {
	if (result != ISC_R_SUCCESS) {
		fprintf(stderr, "%s: %s\n", message,
			isc_result_totext(result));
		exit(1);
	}
}

static void
97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
vbprintf(int level, const char *fmt, ...) {
	va_list ap;
	if (level > verbose)
		return;
	va_start(ap, fmt);
	vprintf(fmt, ap);
	va_end(ap);
}

/* Not thread-safe! */
static char *
nametostr(dns_name_t *name) {
	isc_buffer_t b;
	isc_region_t r;
	static char data[1025];

	isc_buffer_init(&b, data, sizeof(data), ISC_BUFFERTYPE_TEXT);
	dns_name_totext(name, ISC_FALSE, &b);
	isc_buffer_used(&b, &r);
	r.base[r.length] = 0;
	return (char *) r.base;
}

/* Not thread-safe! */
static char *
typetostr(const dns_rdatatype_t type) {
	isc_buffer_t b;
	isc_region_t r;
	static char data[10];

	isc_buffer_init(&b, data, sizeof(data), ISC_BUFFERTYPE_TEXT);
	dns_rdatatype_totext(type, &b);
	isc_buffer_used(&b, &r);
	r.base[r.length] = 0;
	return (char *) r.base;
}

/* Not thread-safe! */
static char *
algtostr(const dns_secalg_t alg) {
	isc_buffer_t b;
	isc_region_t r;
	static char data[10];

	isc_buffer_init(&b, data, sizeof(data), ISC_BUFFERTYPE_TEXT);
	dns_secalg_totext(alg, &b);
	isc_buffer_used(&b, &r);
	r.base[r.length] = 0;
	return (char *) r.base;
}

static inline void
Brian Wellington's avatar
Brian Wellington committed
149 150
set_bit(unsigned char *array, unsigned int index, unsigned int bit) {
	unsigned int byte, shift, mask;
151

Brian Wellington's avatar
Brian Wellington committed
152 153 154 155 156 157 158 159 160 161
	byte = array[index / 8];
	shift = 7 - (index % 8);
	mask = 1 << shift;

	if (bit)
		array[index / 8] |= mask;
	else
		array[index / 8] &= (~mask & 0xFF);
}

162 163 164
static void
signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata,
	    dst_key_t *key, isc_buffer_t *b)
Brian Wellington's avatar
Brian Wellington committed
165 166 167
{
	isc_result_t result;

168
	dns_rdata_init(rdata);
169
	result = dns_dnssec_sign(name, rdataset, key, &starttime, &endtime,
170 171 172 173 174 175 176 177
				 mctx, b, rdata);
	check_result(result, "dns_dnssec_sign()");
#if 0
	/* Verify the data.  This won't work if the start time is reset */
	result = dns_dnssec_verify(name, rdataset, key, mctx, rdata);
	check_result(result, "dns_dnssec_verify()");
#endif
}
Brian Wellington's avatar
Brian Wellington committed
178

179 180 181
static inline isc_boolean_t
issigningkey(signer_key_t *key) {
	return (key->isdefault);
Brian Wellington's avatar
Brian Wellington committed
182 183
}

184 185 186 187 188
static inline isc_boolean_t
iszonekey(signer_key_t *key, dns_db_t *db) {
	char origin[1024];
	isc_buffer_t b;
	isc_result_t result;
Brian Wellington's avatar
Brian Wellington committed
189

Brian Wellington's avatar
Brian Wellington committed
190
	isc_buffer_init(&b, origin, sizeof(origin), ISC_BUFFERTYPE_TEXT);
191 192 193
	result = dns_name_totext(dns_db_origin(db), ISC_FALSE, &b);
	check_result(result, "dns_name_totext()");

194
	return (ISC_TF(strcasecmp(dst_key_name(key->key), origin) == 0 &&
195
		(dst_key_flags(key->key) & DNS_KEYFLAG_OWNERMASK) ==
196
		 DNS_KEYOWNER_ZONE));
197 198 199 200
}

static signer_key_t *
keythatsigned(dns_rdata_generic_sig_t *sig) {
201
	char *keyname;
202
	isc_result_t result;
203 204 205
	dst_key_t *pubkey = NULL, *privkey = NULL;
	signer_key_t *key;

206
	keyname = nametostr(&sig->signer);
207 208 209 210 211 212 213

	key = ISC_LIST_HEAD(keylist);
	while (key != NULL) {
		if (sig->keyid == dst_key_id(key->key) &&
		    sig->algorithm == dst_key_alg(key->key) &&
		    strcasecmp(keyname, dst_key_name(key->key)) == 0)
			return key;
214
		key = ISC_LIST_NEXT(key, link);
215
	}
216

217 218 219 220
	result = dst_key_fromfile(keyname, sig->keyid, sig->algorithm,
				  DST_TYPE_PUBLIC, mctx, &pubkey);
	if (result != ISC_R_SUCCESS)
		return (NULL);
221

222 223 224 225 226
	key = isc_mem_get(mctx, sizeof(signer_key_t));
	if (key == NULL)
		check_result(ISC_R_FAILURE, "isc_mem_get");

	result = dst_key_fromfile(keyname, sig->keyid, sig->algorithm,
Brian Wellington's avatar
Brian Wellington committed
227
				  DST_TYPE_PRIVATE, mctx, &privkey);
228 229 230 231 232 233 234 235 236
	if (result == ISC_R_SUCCESS) {
		key->key = privkey;
		dst_key_free(pubkey);
	}
	else
		key->key = pubkey;
	key->isdefault = ISC_FALSE;
	ISC_LIST_APPEND(keylist, key, link);
	return key;
237 238
}

239 240 241
static isc_boolean_t
expecttofindkey(dns_name_t *name, dns_db_t *db, dns_dbversion_t *version) {
	unsigned int options = DNS_DBFIND_NOWILD;
242
	dns_fixedname_t fname;
243 244
	isc_result_t result;

245
	dns_fixedname_init(&fname);
246
	result = dns_db_find(db, name, version, dns_rdatatype_key, options,
247
			     0, NULL, dns_fixedname_name(&fname), NULL, NULL);
248 249 250 251 252 253 254 255 256 257 258
	switch (result) {
		case DNS_R_SUCCESS:
		case DNS_R_NXDOMAIN:
		case DNS_R_NXRDATASET:
			return ISC_TRUE;
		case DNS_R_DELEGATION:
		case DNS_R_CNAME:
		case DNS_R_DNAME:
			return ISC_FALSE;
		default:
			check_result(result, "dns_db_find");
259
			return ISC_FALSE; /* removes a warning */
260 261 262 263 264 265
	}
}

static isc_boolean_t
setverifies(dns_name_t *name, dns_rdataset_t *set, signer_key_t *key,
	    dns_rdata_t *sig)
266
{
267
	isc_result_t result = dns_dnssec_verify(name, set, key->key, mctx, sig);
268
	return (ISC_TF(result == ISC_R_SUCCESS));
269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288
}

#define allocbufferandrdata \
	isc_buffer_t b; \
	trdata = isc_mem_get(mctx, sizeof(dns_rdata_t)); \
	tdata = isc_mem_get(mctx, sizeof(signer_array_t)); \
	ISC_LIST_APPEND(arraylist, tdata, link); \
	if (trdata == NULL || tdata == NULL) \
		check_result(ISC_R_FAILURE, "isc_mem_get"); \
	isc_buffer_init(&b, tdata->array, sizeof(tdata->array), \
			ISC_BUFFERTYPE_BINARY);

static void
signset(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
	 dns_name_t *name, dns_rdataset_t *set)
{
	dns_rdatalist_t siglist;
	dns_rdataset_t sigset, oldsigset;
	dns_rdata_t oldsigrdata;
	dns_rdata_t *trdata;
289
	dns_rdata_generic_sig_t sig;
290
	signer_key_t *key;
291
	isc_result_t result;
292
	isc_boolean_t notsigned = ISC_TRUE, nosigs = ISC_FALSE;
293 294 295
	isc_boolean_t wassignedby[256], nowsignedby[256];
	signer_array_t *tdata;
	ISC_LIST(signer_array_t) arraylist;
296
	int i;
297 298 299 300 301 302 303 304 305 306

	ISC_LIST_INIT(siglist.rdata);
	ISC_LIST_INIT(arraylist);

	for (i = 0; i < 256; i++)
		wassignedby[i] = nowsignedby[i] = ISC_FALSE;

	dns_rdataset_init(&oldsigset);
	result = dns_db_findrdataset(db, node, version, dns_rdatatype_sig,
				     set->type, 0, &oldsigset, NULL);
307 308 309 310 311
	if (result == ISC_R_NOTFOUND) {
		result = ISC_R_SUCCESS;
		nosigs = ISC_TRUE;
	}
	check_result(result, "dns_db_findrdataset()");
312

313 314
	vbprintf(1, "%s/%s:\n", nametostr(name), typetostr(set->type));

315
	if (!nosigs) {
316 317
		result = dns_rdataset_first(&oldsigset);
		while (result == ISC_R_SUCCESS) {
318
			isc_boolean_t expired, future;
319 320 321 322 323 324 325
			isc_boolean_t keep = ISC_FALSE, resign = ISC_FALSE;

			dns_rdataset_current(&oldsigset, &oldsigrdata);

			result = dns_rdata_tostruct(&oldsigrdata, &sig, mctx);
			check_result(result, "dns_rdata_tostruct");

326 327
			expired = ISC_TF(now + cycle > sig.timeexpire);
			future = ISC_TF(now < sig.timesigned);
328 329 330

			key = keythatsigned(&sig);

331 332 333 334 335 336 337 338
			if (sig.timesigned > sig.timeexpire) {
				/* sig is dropped and not replaced */
				vbprintf(2, "\tsig by %s/%s/%d dropped - "
					 "invalid validity period\n",
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
			}
339
			else if (key == NULL && !future &&
340
				 expecttofindkey(&sig.signer, db, version))
341 342 343 344 345 346 347 348
			{
				/* sig is dropped and not replaced */
				vbprintf(2, "\tsig by %s/%s/%d dropped - "
					 "private key not found\n",
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
			}
349
			else if (key == NULL || future) {
350 351 352 353 354 355
				vbprintf(2, "\tsig by %s/%s/%d %s - "
					 "key not found\n",
					 expired ? "retained" : "dropped",
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
356 357 358
				if (!expired)
					keep = ISC_TRUE;
			}
359 360 361 362
			else if (issigningkey(key)) {
				if (!expired &&
				    setverifies(name, set, key, &oldsigrdata))
				{
363 364 365 366 367
					vbprintf(2,
						 "\tsig by %s/%s/%d retained\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
						 sig.keyid);
368 369 370 371
					keep = ISC_TRUE;
					wassignedby[sig.algorithm] = ISC_TRUE;
				}
				else {
372
					vbprintf(2,
373
						 "\tsig by %s/%s/%d dropped - "
374 375 376
						 "%s\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
377 378 379
						 sig.keyid,
						 expired ? "expired" :
							   "failed to verify");
380 381 382
					wassignedby[sig.algorithm] = ISC_TRUE;
					resign = ISC_TRUE;
				}
Brian Wellington's avatar
Brian Wellington committed
383
			}
384 385 386 387
			else if (iszonekey(key, db)) {
				if (!expired &&
				    setverifies(name, set, key, &oldsigrdata))
				{
388 389 390 391 392
					vbprintf(2,
						 "\tsig by %s/%s/%d retained\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
						 sig.keyid);
393 394 395 396 397
					keep = ISC_TRUE;
					wassignedby[sig.algorithm] = ISC_TRUE;
					nowsignedby[sig.algorithm] = ISC_TRUE;
				}
				else {
398 399 400 401 402
					vbprintf(2,
						 "\tsig by %s/%s/%d dropped - ",
						 "%s\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
403 404 405
						 sig.keyid,
						 expired ? "expired" :
							   "failed to verify");
406 407 408 409 410
					wassignedby[sig.algorithm] = ISC_TRUE;
					if (dst_key_isprivate(key->key))
						resign = ISC_TRUE;
				}
			}
411
			else if (!expired) {
Brian Wellington's avatar
Brian Wellington committed
412
				vbprintf(2, "\tsig by %s/%s/%d retained\n",
413 414 415
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
416
				keep = ISC_TRUE;
417 418
			}
			else {
Brian Wellington's avatar
Brian Wellington committed
419
				vbprintf(2, "\tsig by %s/%s/%d expired\n",
420 421 422 423
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
			}
424 425 426 427 428 429 430 431 432 433 434 435

			if (keep) {
				allocbufferandrdata;
				result = dns_rdata_fromstruct(trdata,
							      set->rdclass,
							      dns_rdatatype_sig,
							      &sig, &b);
				nowsignedby[sig.algorithm] = ISC_TRUE;
				ISC_LIST_APPEND(siglist.rdata, trdata, link);
			}
			else if (resign) {
				allocbufferandrdata;
436 437 438 439
				vbprintf(1, "\tresigning with key %s/%s/%d\n",
				       dst_key_name(key->key),
				       algtostr(dst_key_alg(key->key)),
				       dst_key_id(key->key));
440 441 442 443 444 445 446
				signwithkey(name, set, trdata, key->key, &b);
				nowsignedby[sig.algorithm] = ISC_TRUE;
				ISC_LIST_APPEND(siglist.rdata, trdata, link);
			}

			dns_rdata_freestruct(&sig);
			result = dns_rdataset_next(&oldsigset);
447
		}
448 449 450 451
		if (result == DNS_R_NOMORE)
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_dns_rdataset_first()/next()");
		dns_rdataset_disassociate(&oldsigset);
Brian Wellington's avatar
Brian Wellington committed
452
	}
453 454 455 456 457

	for (i = 0; i < 256; i++)
		if (wassignedby[i] != 0) {
			notsigned = ISC_FALSE;
			break;
Brian Wellington's avatar
Brian Wellington committed
458
		}
459 460 461 462 463 464 465 466 467

	key = ISC_LIST_HEAD(keylist);
	while (key != NULL) {
		int alg = dst_key_alg(key->key);
		if (key->isdefault &&
		    (notsigned || (wassignedby[alg] && !nowsignedby[alg])))
		{
			allocbufferandrdata;
			signwithkey(name, set, trdata, key->key, &b);
468 469 470 471
			vbprintf(1, "\tsigning with key %s/%s/%d\n",
			       dst_key_name(key->key),
			       algtostr(dst_key_alg(key->key)),
			       dst_key_id(key->key));
472 473 474 475 476
			ISC_LIST_APPEND(siglist.rdata, trdata, link);
		}
		key = ISC_LIST_NEXT(key, link);
	}

477 478 479 480
	if (!ISC_LIST_EMPTY(siglist.rdata)) {
		siglist.rdclass = set->rdclass;
		siglist.type = dns_rdatatype_sig;
		siglist.covers = set->type;
481 482
		if (endtime - starttime < set->ttl)
			siglist.ttl = endtime - starttime;
483 484 485 486 487 488
		else
			siglist.ttl = set->ttl;
		dns_rdataset_init(&sigset);
		result = dns_rdatalist_tordataset(&siglist, &sigset);
		check_result(result, "dns_rdatalist_tordataset");
		result = dns_db_addrdataset(db, node, version, 0, &sigset,
489
					    0, NULL);
490 491 492 493 494 495 496 497 498 499 500
		if (result == DNS_R_UNCHANGED)
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_addrdataset");
		dns_rdataset_disassociate(&sigset);
	}
	else if (!nosigs) {
	/*
		dns_db_deleterdataset(db, node, version, dns_rdatatype_sig,
				      set->type);
	*/
	}
501 502 503 504 505 506

	trdata = ISC_LIST_HEAD(siglist.rdata);
	while (trdata != NULL) {
		dns_rdata_t *next = ISC_LIST_NEXT(trdata, link);
		isc_mem_put(mctx, trdata, sizeof(dns_rdata_t));
		trdata = next;
507
	}
Brian Wellington's avatar
Brian Wellington committed
508

509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540
	tdata = ISC_LIST_HEAD(arraylist);
	while (tdata != NULL) {
		signer_array_t *next = ISC_LIST_NEXT(tdata, link);
		isc_mem_put(mctx, tdata, sizeof(signer_array_t));
		tdata = next;
	}
}

static isc_boolean_t
hasnullkey(dns_rdataset_t rdataset) {
	isc_result_t result;
	dns_rdata_t rdata;
	isc_uint32_t flags;

	result = dns_rdataset_first(&rdataset);
	while (result == ISC_R_SUCCESS) {
		dst_key_t *key = NULL;

		dns_rdataset_current(&rdataset, &rdata);
		result = dns_dnssec_keyfromrdata(dns_rootname,
						 &rdata, mctx, &key);
		check_result(result, "dns_dnssec_keyfromrdata()");
		flags = dst_key_flags(key);
		dst_key_free(key);
		if (((flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY) &&
		    ((flags & DNS_KEYFLAG_OWNERMASK) == DNS_KEYOWNER_ZONE))
			return (ISC_TRUE);
		result = dns_rdataset_next(&rdataset);
	}
	if (result != DNS_R_NOMORE)
		check_result(result, "iteration over keys");
	return (ISC_FALSE);
541 542
}

Brian Wellington's avatar
Brian Wellington committed
543
static void
544
signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
Brian Wellington's avatar
Brian Wellington committed
545
	 dns_name_t *name, isc_boolean_t atorigin)
Brian Wellington's avatar
Brian Wellington committed
546 547
{
	isc_result_t result;
548 549
	dns_rdata_t rdata;
	dns_rdataset_t rdataset, nsset;
Brian Wellington's avatar
Brian Wellington committed
550
	dns_rdatasetiter_t *rdsiter;
Brian Wellington's avatar
Brian Wellington committed
551
	isc_boolean_t isdelegation = ISC_FALSE;
552

553 554 555 556 557 558 559 560 561 562 563
	if (!atorigin) {
		dns_rdataset_init(&nsset);
		result = dns_db_findrdataset(db, node, version,
					     dns_rdatatype_ns, 0, 0, &nsset,
					     NULL);
		/* Is this a delegation point? */
		if (result == ISC_R_SUCCESS) {
			isdelegation = ISC_TRUE;
			dns_rdataset_disassociate(&nsset);
		}
	}
Brian Wellington's avatar
Brian Wellington committed
564 565 566 567 568 569 570
	dns_rdataset_init(&rdataset);
	rdsiter = NULL;
	result = dns_db_allrdatasets(db, node, version, 0, &rdsiter);
	check_result(result, "dns_db_allrdatasets()");
	result = dns_rdatasetiter_first(rdsiter);
	while (result == ISC_R_SUCCESS) {
		dns_rdatasetiter_current(rdsiter, &rdataset);
Brian Wellington's avatar
Brian Wellington committed
571

572 573 574
		/* If this is a SIG set, skip it. */
		if (rdataset.type == dns_rdatatype_sig)
			goto skip;
Brian Wellington's avatar
Brian Wellington committed
575

576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594
		/* If this is a KEY set at the apex, skip it. */
		if (rdataset.type == dns_rdatatype_key && atorigin)
			goto skip;

		/*
		 * If this name is a delegation point, skip all records
		 * except a KEY set containing a NULL key or an NXT set.
		 */
		if (isdelegation) {
			switch (rdataset.type) {
				case dns_rdatatype_nxt:
					break;
				case dns_rdatatype_key:
					if (hasnullkey(rdataset))
						break;
					goto skip;
				default:
					goto skip;
			}
595 596
		}

597
		/*
598 599 600
		 * There probably should be a dns_nxtsetbit, but it can get
		 * complicated if we need to extend the length of the
		 * bit set.  In this case, since the NXT bit is set and
601 602
		 * SIG < NXT, the easy way works.
		 */
603
		if (rdataset.type == dns_rdatatype_nxt) {
Brian Wellington's avatar
Brian Wellington committed
604 605 606 607 608 609 610 611 612 613 614 615 616 617
			unsigned char *nxt_bits;
			dns_name_t nxtname;
			isc_region_t r, r2;

			result = dns_rdataset_first(&rdataset);
			check_result(result, "dns_rdataset_first()");
			dns_rdataset_current(&rdataset, &rdata);
			dns_rdata_toregion(&rdata, &r);
			dns_name_init(&nxtname, NULL);
			dns_name_fromregion(&nxtname, &r);
			dns_name_toregion(&nxtname, &r2);
			nxt_bits = r.base + r2.length;
			set_bit(nxt_bits, dns_rdatatype_sig, 1);
		}
Brian Wellington's avatar
Brian Wellington committed
618

619
		signset(db, version, node, name, &rdataset);
Brian Wellington's avatar
Brian Wellington committed
620

621
 skip:
Brian Wellington's avatar
Brian Wellington committed
622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691
		dns_rdataset_disassociate(&rdataset);
		result = dns_rdatasetiter_next(rdsiter);
	}
	if (result != DNS_R_NOMORE)
		fatal("rdataset iteration failed");
	dns_rdatasetiter_destroy(&rdsiter);
}

static inline isc_boolean_t
active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) {
	dns_rdatasetiter_t *rdsiter;
	isc_boolean_t active = ISC_FALSE;
	isc_result_t result;
	dns_rdataset_t rdataset;

	dns_rdataset_init(&rdataset);
	rdsiter = NULL;
	result = dns_db_allrdatasets(db, node, version, 0, &rdsiter);
	check_result(result, "dns_db_allrdatasets()");
	result = dns_rdatasetiter_first(rdsiter);
	while (result == ISC_R_SUCCESS) {
		dns_rdatasetiter_current(rdsiter, &rdataset);
		if (rdataset.type != dns_rdatatype_nxt)
			active = ISC_TRUE;
		dns_rdataset_disassociate(&rdataset);
		if (!active)
			result = dns_rdatasetiter_next(rdsiter);
		else
			result = DNS_R_NOMORE;
	}
	if (result != DNS_R_NOMORE)
		fatal("rdataset iteration failed");
	dns_rdatasetiter_destroy(&rdsiter);

	if (!active) {
		/*
		 * Make sure there is no NXT record for this node.
		 */
		result = dns_db_deleterdataset(db, node, version,
					       dns_rdatatype_nxt);
		if (result == DNS_R_UNCHANGED)
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_deleterdataset");
	}

	return (active);
}

static inline isc_result_t
next_active(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter,
	    dns_name_t *name, dns_dbnode_t **nodep)
{
	isc_result_t result;
	isc_boolean_t active;

	do {
		active = ISC_FALSE;
		result = dns_dbiterator_current(dbiter, nodep, name);
		if (result == ISC_R_SUCCESS) {
			active = active_node(db, version, *nodep);
			if (!active) {
				dns_db_detachnode(db, nodep);
				result = dns_dbiterator_next(dbiter);
			}
		}
	} while (result == ISC_R_SUCCESS && !active);

	return (result);
}

692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711
static inline isc_result_t
next_nonglue(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter,
	    dns_name_t *name, dns_dbnode_t **nodep, dns_name_t *lastcut)
{
	isc_result_t result;

	if (lastcut == NULL)
		return next_active(db, version, dbiter, name, nodep);
	do {
		result = next_active(db, version, dbiter, name, nodep);
		if (result == ISC_R_SUCCESS) {
			if (!dns_name_issubdomain(name, lastcut))
				return (ISC_R_SUCCESS);
			dns_db_detachnode(db, nodep);
			result = dns_dbiterator_next(dbiter);
		}
	} while (result == ISC_R_SUCCESS);
	return (result);
}

Brian Wellington's avatar
Brian Wellington committed
712
static void
713
signzone(dns_db_t *db, dns_dbversion_t *version) {
714
	isc_result_t result, nxtresult;
Brian Wellington's avatar
Brian Wellington committed
715
	dns_dbnode_t *node, *nextnode, *curnode;
Brian Wellington's avatar
Brian Wellington committed
716
	dns_fixedname_t fname, fnextname, fcurname;
717
	dns_name_t *name, *nextname, *target, *curname, *lastcut;
Brian Wellington's avatar
Brian Wellington committed
718
	dns_dbiterator_t *dbiter;
Brian Wellington's avatar
Brian Wellington committed
719
	isc_boolean_t atorigin = ISC_TRUE;
Brian Wellington's avatar
Brian Wellington committed
720 721 722 723 724

	dns_fixedname_init(&fname);
	name = dns_fixedname_name(&fname);
	dns_fixedname_init(&fnextname);
	nextname = dns_fixedname_name(&fnextname);
Brian Wellington's avatar
Brian Wellington committed
725 726
	dns_fixedname_init(&fcurname);
	curname = dns_fixedname_name(&fcurname);
Brian Wellington's avatar
Brian Wellington committed
727

728
	lastcut = NULL;
Brian Wellington's avatar
Brian Wellington committed
729 730 731 732 733
	dbiter = NULL;
	result = dns_db_createiterator(db, ISC_FALSE, &dbiter);
	check_result(result, "dns_db_createiterator()");
	result = dns_dbiterator_first(dbiter);
	node = NULL;
734 735
	dns_name_clone(dns_db_origin(db), name);
	result = next_active(db, version, dbiter, name, &node);
Brian Wellington's avatar
Brian Wellington committed
736 737 738
	while (result == ISC_R_SUCCESS) {
		nextnode = NULL;
		curnode = NULL;
Brian Wellington's avatar
Brian Wellington committed
739
		dns_dbiterator_current(dbiter, &curnode, curname);
740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774
		if (!atorigin) {
			dns_rdatasetiter_t *rdsiter = NULL;
			dns_rdataset_t set;

			dns_rdataset_init(&set);
			result = dns_db_allrdatasets(db, curnode, version,
						     0, &rdsiter);
			check_result(result, "dns_db_allrdatasets");
			result = dns_rdatasetiter_first(rdsiter);
			while (result == ISC_R_SUCCESS) {
				dns_rdatasetiter_current(rdsiter, &set);
				if (set.type == dns_rdatatype_ns) {
					dns_rdataset_disassociate(&set);
					break;
				}
				dns_rdataset_disassociate(&set);
				result = dns_rdatasetiter_next(rdsiter);
			}
			if (result != ISC_R_SUCCESS && result != ISC_R_NOMORE)
				fatal("rdataset iteration failed");
			if (result == ISC_R_SUCCESS) {
				if (lastcut != NULL)
					dns_name_free(lastcut, mctx);
				else {
					lastcut = isc_mem_get(mctx,
							sizeof(dns_name_t));
					if (lastcut == NULL)
						fatal("allocation failure");
				}
				dns_name_init(lastcut, NULL);
				result = dns_name_dup(curname, mctx, lastcut);
				check_result(result, "dns_name_dup");
			}
			dns_rdatasetiter_destroy(&rdsiter);
		}
Brian Wellington's avatar
Brian Wellington committed
775 776
		result = dns_dbiterator_next(dbiter);
		if (result == ISC_R_SUCCESS)
777 778
			result = next_nonglue(db, version, dbiter, nextname,
					      &nextnode, lastcut);
Brian Wellington's avatar
Brian Wellington committed
779 780 781 782 783 784 785 786
		if (result == ISC_R_SUCCESS)
			target = nextname;
		else if (result == DNS_R_NOMORE)
			target = dns_db_origin(db);
		else {
			target = NULL;	/* Make compiler happy. */
			fatal("db iteration failed");
		}
787 788
		nxtresult = dns_buildnxt(db, version, node, target);
		check_result(nxtresult, "dns_buildnxt()");
Brian Wellington's avatar
Brian Wellington committed
789
		signname(db, version, node, curname, atorigin);
790
		atorigin = ISC_FALSE;
Brian Wellington's avatar
Brian Wellington committed
791 792 793 794 795 796
		dns_db_detachnode(db, &node);
		dns_db_detachnode(db, &curnode);
		node = nextnode;
	}
	if (result != DNS_R_NOMORE)
		fatal("db iteration failed");
797 798 799 800
	if (lastcut != NULL) {
		dns_name_free(lastcut, mctx);
		isc_mem_put(mctx, lastcut, sizeof(dns_name_t));
	}
Brian Wellington's avatar
Brian Wellington committed
801
	dns_dbiterator_destroy(&dbiter);
802 803 804
}

static void
805
loadzone(char *file, char *origin, dns_zone_t **zone) {
806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821
	isc_buffer_t b, b2;
	unsigned char namedata[1024];
	int len;
	dns_name_t name;
	isc_result_t result;

	len = strlen(origin);
	isc_buffer_init(&b, origin, len, ISC_BUFFERTYPE_TEXT);
	isc_buffer_add(&b, len);

	isc_buffer_init(&b2, namedata, sizeof(namedata), ISC_BUFFERTYPE_BINARY);

	dns_name_init(&name, NULL);
	result = dns_name_fromtext(&name, &b, dns_rootname, ISC_FALSE, &b2);
	check_result(result, "dns_name_fromtext()");

822 823
	result = dns_zone_create(zone, mctx);
	check_result(result, "dns_zone_create()");
824

825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848
	dns_zone_settype(*zone, dns_zone_master);

	result = dns_zone_setdbtype(*zone, "rbt");
	check_result(result, "dns_zone_setdbtype()");

	result = dns_zone_setdatabase(*zone, file);
	check_result(result, "dns_zone_setdatabase()");

	result = dns_zone_setorigin(*zone, &name);
	check_result(result, "dns_zone_origin()");

	dns_zone_setclass(*zone, dns_rdataclass_in); /* XXX */

	result = dns_zone_load(*zone);
	check_result(result, "dns_zone_load()");
}

static void
getdb(dns_zone_t *zone, dns_db_t **db, dns_dbversion_t **version) {
	isc_result_t result;

	*db = NULL;
	result = dns_zone_getdb(zone, db);
	check_result(result, "dns_zone_getdb()");
849 850 851 852 853 854 855 856 857 858 859

	result = dns_db_newversion(*db, version);
	check_result(result, "dns_db_newversion()");
}

static void
loadzonekeys(dns_db_t *db, dns_dbversion_t *version) {
	dns_name_t *origin;
	dns_dbnode_t *node;
	isc_result_t result;
	dst_key_t *keys[20];
860
	unsigned int nkeys, i;
861 862 863 864 865 866 867 868 869

	origin = dns_db_origin(db);

	node = NULL;
	result = dns_db_findnode(db, origin, ISC_FALSE, &node);
	check_result(result, "dns_db_findnode()");

	result = dns_dnssec_findzonekeys(db, version, node, origin, mctx,
					 20, keys, &nkeys);
870 871
	if (result == ISC_R_NOTFOUND)
		result = ISC_R_SUCCESS;
872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887
	check_result(result, "dns_dnssec_findzonekeys()");

	for (i = 0; i < nkeys; i++) {
		signer_key_t *key;

		key = isc_mem_get(mctx, sizeof(signer_key_t));
		if (key == NULL)
			check_result(ISC_R_FAILURE, "isc_mem_get(key)");
		key->key = keys[i];
		key->isdefault = ISC_FALSE;

		ISC_LIST_APPEND(keylist, key, link);
	}
	dns_db_detachnode(db, &node);
}

888 889 890 891 892 893 894 895 896 897
static void
dumpzone(dns_zone_t *zone, char *filename) {
	isc_result_t result;
	FILE *fp;

	fp = fopen(filename, "w");
	if (fp == NULL) {
		fprintf(stderr, "failure opening %s\n", filename);
		exit(-1);
	}
898
	result = dns_zone_dumptostream(zone, fp);
899 900 901
	check_result(result, "dns_zone_dump");
	fclose(fp);
}
902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933

static isc_stdtime_t
strtotime(char *str, isc_int64_t now, isc_int64_t base) {
	isc_int64_t val, offset;
	isc_result_t result;
	char *endp = "";

	if (str[0] == '+') {
		offset = strtol(str + 1, &endp, 0);
		val = base + offset;
	}
	else if (strncmp(str, "now+", 4) == 0) {
		offset = strtol(str + 4, &endp, 0);
		val = now + offset;
	}
	else {
		result = dns_time64_fromtext(str, &val);
		check_result(result, "dns_time64_fromtext()");
	}
	if (*endp != '\0')
		check_result(ISC_R_FAILURE, "strtol()");

	return ((isc_stdtime_t) val);
}

static void
usage() {
	fprintf(stderr, "Usage:\n");
	fprintf(stderr, "\tsigner [options] zonefile [keys]\n");

	fprintf(stderr, "\n");

Brian Wellington's avatar
Brian Wellington committed
934
	fprintf(stderr, "Options: (default value in parenthesis) \n");
935 936 937 938 939 940 941 942
	fprintf(stderr, "\t-s YYYYMMDDHHMMSS|+ttl:\n");
	fprintf(stderr, "\t\tSIG start time - absolute|offset (now)\n");
	fprintf(stderr, "\t-e YYYYMMDDHHMMSS|+ttl|now+ttl]:\n");
	fprintf(stderr, "\t\tSIG end time  - absolute|from start|from now (now + 30 days)\n");
	fprintf(stderr, "\t-c ttl:\n");
	fprintf(stderr, "\t\tcycle period - regenerate if < cycle from end ( (end-start)/4 )\n");
	fprintf(stderr, "\t-v level:\n");
	fprintf(stderr, "\t\tverbose level (0)\n");
943 944
	fprintf(stderr, "\t-l\n");
	fprintf(stderr, "\t\tturn on logging to standard output\n");
945
	fprintf(stderr, "\t-o origin:\n");
Brian Wellington's avatar
Brian Wellington committed
946
	fprintf(stderr, "\t\tzone origin (name of zonefile)\n");
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962
	fprintf(stderr, "\t-f outfile:\n");
	fprintf(stderr, "\t\tfile the signed zone is written in " \
			"(zonefile + .signed)\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "Signing Keys:\n");
	fprintf(stderr, "\tid:\t\t");
	fprintf(stderr, "zone key with matching keyid\n");
	fprintf(stderr, "\tid/alg:\t\t");
	fprintf(stderr, "zone key with matching keyid and algorithm\n");
	fprintf(stderr, "\tname/id/alg:\t");
	fprintf(stderr, "key with matching name, keyid and algorithm\n");
	fprintf(stderr, "\tnone:\t\t");
	fprintf(stderr, "all zone keys that have private keys\n");
	exit(0);
Brian Wellington's avatar
Brian Wellington committed
963 964 965 966
}

int
main(int argc, char *argv[]) {
967 968 969 970
	int i, ch;
	char *startstr = NULL, *endstr = NULL;
	char *origin = NULL, *file = NULL, *output = NULL;
	char *endp;
971
	dns_zone_t *zone;
972 973 974
	dns_db_t *db;
	dns_dbversion_t *version;
	signer_key_t *key;
Brian Wellington's avatar
Brian Wellington committed
975
	isc_result_t result;
976
	isc_log_t *log = NULL;
Brian Wellington's avatar
Brian Wellington committed
977 978 979 980 981 982

	dns_result_register();

	result = isc_mem_create(0, 0, &mctx);
	check_result(result, "isc_mem_create()");

983
	while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:hl")) != -1)
Brian Wellington's avatar
Brian Wellington committed
984
	{
985 986
		switch (ch) {
		case 's':
987 988
			startstr = isc_mem_strdup(mctx,
						  isc_commandline_argument);
989 990 991 992 993
			if (startstr == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'e':
994 995
			endstr = isc_mem_strdup(mctx,
						isc_commandline_argument);
996 997 998 999 1000 1001
			if (endstr == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'c':
			endp = NULL;
1002
			cycle = strtol(isc_commandline_argument, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1003
			if (*endp != '\0')
1004 1005 1006 1007 1008
				check_result(ISC_R_FAILURE, "strtol()");
			break;

		case 'v':
			endp = NULL;
1009
			verbose = strtol(isc_commandline_argument, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1010
			if (*endp != '\0')
1011 1012 1013
				check_result(ISC_R_FAILURE, "strtol()");
			break;

1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024
		case 'l':
			RUNTIME_CHECK(isc_log_create(mctx, &log) == 
				      ISC_R_SUCCESS);
			RUNTIME_CHECK(dns_log_init(log) == ISC_R_SUCCESS);
	
			RUNTIME_CHECK(isc_log_usechannel(log, "default_stderr",
							 NULL, NULL)
				      == ISC_R_SUCCESS);
			dns_lctx = log;
			break;

1025
		case 'o':
1026 1027
			origin = isc_mem_strdup(mctx,
						isc_commandline_argument);
1028 1029 1030 1031 1032
			if (origin == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'f':
1033 1034
			output = isc_mem_strdup(mctx,
						isc_commandline_argument);
1035 1036 1037 1038 1039 1040 1041 1042 1043 1044
			if (output == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'h':
			usage();

		}
	}

1045
	isc_stdtime_get(&now);
1046 1047

	if (startstr != NULL) {
1048
		starttime = strtotime(startstr, now, now);
1049 1050 1051
		isc_mem_free(mctx, startstr);
	}
	else
1052
		starttime = now;
1053 1054

	if (endstr != NULL) {
1055
		endtime = strtotime(endstr, now, starttime);
1056 1057 1058
		isc_mem_free(mctx, endstr);
	}
	else
1059
		endtime = starttime + (30 * 24 * 60 * 60);
1060 1061

	if (cycle == -1) {
1062
		cycle = (endtime - starttime) / 4;
1063 1064
	}

1065 1066
	argc -= isc_commandline_index;
	argv += isc_commandline_index;
1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085

	if (argc < 1)
		check_result(ISC_R_FAILURE, "No zones specified");

	file = isc_mem_strdup(mctx, argv[0]);
	if (file == NULL)
		check_result(ISC_R_FAILURE, "isc_mem_strdup()");

	argc -= 1;
	argv += 1;

	if (output == NULL) {
		output = isc_mem_allocate(mctx,
					  strlen(file) + strlen(".signed") + 1);
		if (output == NULL)
			check_result(ISC_R_FAILURE, "isc_mem_allocate()");
		sprintf(output, "%s.signed", file);
	}

1086 1087 1088 1089 1090 1091 1092 1093
	if (origin == NULL) {
		origin = isc_mem_allocate(mctx, strlen(file) + 2);
		if (origin == NULL)
			check_result(ISC_R_FAILURE, "isc_mem_allocate()");
		strcpy(origin, file);
		if (file[strlen(file) - 1] != '.')
			strcat(origin, ".");
	}
1094

1095 1096 1097
	zone = NULL;
	loadzone(file, origin, &zone);

1098 1099
	db = NULL;
	version = NULL;
1100
	getdb(zone, &db, &version);
1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116

	ISC_LIST_INIT(keylist);
	loadzonekeys(db, version);

	if (argc == 0) {
		signer_key_t *key;

		key = ISC_LIST_HEAD(keylist);
		while (key != NULL) {
			key->isdefault = ISC_TRUE;
			key = ISC_LIST_NEXT(key, link);
		}
	}
	else {
		for (i = 0; i < argc; i++) {
			int id, alg;
1117
			char *idstr = NULL, *name = NULL, *algstr = NULL, *s;
1118 1119 1120 1121 1122

			idstr = argv[i];
			algstr = strchr(idstr, '/');
			if (algstr != NULL) {
				*algstr++ = 0;
1123 1124 1125 1126 1127 1128 1129
				s = strchr(algstr, '/');
				if (s != NULL) {
					*s++ = 0;
					name = idstr;
					idstr = algstr;
					algstr = s;
				}
1130 1131 1132 1133
			}

			endp = NULL;
			id = strtol(idstr, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1134
			if (*endp != '\0')
1135 1136 1137 1138
				check_result(ISC_R_FAILURE, "strtol");

			if (algstr != NULL) {
				endp = NULL;
1139
				alg = strtol(algstr, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1140
				if (*endp != '\0')
1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159
					check_result(ISC_R_FAILURE, "strtol");
			}
			else
				alg = 0;

			if (name == NULL)
				name = origin;
			key = ISC_LIST_HEAD(keylist);
			while (key != NULL) {
				dst_key_t *dkey = key->key;
				if (dst_key_id(dkey) == id &&
				    (alg == 0 || dst_key_alg(dkey) == alg) &&
				    strcasecmp(name, dst_key_name(dkey)) == 0)
				{
					key->isdefault = ISC_TRUE;
					if (!dst_key_isprivate(dkey))
						check_result
							(DST_R_NOTPRIVATEKEY,
							 "key specify");
1160 1161
					if (alg == 0)
						alg = dst_key_alg(dkey);
1162 1163
					break;
				}
Brian Wellington's avatar
Brian Wellington committed
1164
				key = ISC_LIST_NEXT(key, link);
1165
			}
1166
			if (key == NULL && alg != 0) {
1167 1168 1169 1170 1171
				dst_key_t *dkey = NULL;
				result = dst_key_fromfile(name, id, alg,
							  DST_TYPE_PRIVATE,
							  mctx, &dkey);
				check_result (result, "dst_key_fromfile");
1172 1173 1174 1175
				key = isc_mem_get(mctx, sizeof(signer_key_t));
				if (key == NULL)
					check_result(ISC_R_FAILURE,
						     "isc_mem_get");
1176 1177 1178 1179
				key->key = dkey;
				key->isdefault = ISC_TRUE;
				ISC_LIST_APPEND(keylist, key, link);
			}
1180 1181
			else
				printf("Ignoring key with algorithm 0\n");
1182 1183 1184 1185 1186 1187 1188
		}
	}

	signzone(db, version);

	/* should we update the SOA serial? */
	dns_db_closeversion(db, &version, ISC_TRUE);