signer.c 33 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
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;
};

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

Brian Wellington's avatar
Brian Wellington committed
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
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
98
99
100
101
102
vbprintf(int level, const char *fmt, ...) {
	va_list ap;
	if (level > verbose)
		return;
	va_start(ap, fmt);
103
	vfprintf(stderr, fmt, ap);
104
105
106
107
108
109
110
111
112
113
	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];

114
	isc_buffer_init(&b, data, sizeof(data));
115
	dns_name_totext(name, ISC_FALSE, &b);
116
	isc_buffer_usedregion(&b, &r);
117
118
119
120
121
122
123
124
125
126
127
	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];

128
	isc_buffer_init(&b, data, sizeof(data));
129
	dns_rdatatype_totext(type, &b);
130
	isc_buffer_usedregion(&b, &r);
131
132
133
134
135
136
137
138
139
140
141
	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];

142
	isc_buffer_init(&b, data, sizeof(data));
143
	dns_secalg_totext(alg, &b);
144
	isc_buffer_usedregion(&b, &r);
145
146
147
148
149
	r.base[r.length] = 0;
	return (char *) r.base;
}

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

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

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

163
164
165
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
166
167
168
{
	isc_result_t result;

169
	dns_rdata_init(rdata);
170
	result = dns_dnssec_sign(name, rdataset, key, &starttime, &endtime,
171
172
				 mctx, b, rdata);
	check_result(result, "dns_dnssec_sign()");
173
174

	if (tryverify != 0) {
175
176
		result = dns_dnssec_verify(name, rdataset, key,
					   ISC_TRUE, mctx, rdata);
177
178
179
180
181
			if (result == ISC_R_SUCCESS)
				vbprintf(3, "\tsignature verified\n");
			else
				vbprintf(3, "\tsignature failed to verify\n");
	}
182
}
Brian Wellington's avatar
Brian Wellington committed
183

184
185
186
static inline isc_boolean_t
issigningkey(signer_key_t *key) {
	return (key->isdefault);
Brian Wellington's avatar
Brian Wellington committed
187
188
}

189
190
191
192
193
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
194

195
	isc_buffer_init(&b, origin, sizeof(origin));
196
197
198
	result = dns_name_totext(dns_db_origin(db), ISC_FALSE, &b);
	check_result(result, "dns_name_totext()");

199
	return (ISC_TF(strcasecmp(dst_key_name(key->key), origin) == 0 &&
200
		(dst_key_flags(key->key) & DNS_KEYFLAG_OWNERMASK) ==
201
		 DNS_KEYOWNER_ZONE));
202
203
}

204
205
206
207
/*
 * Finds the key that generated a SIG, if possible.  First look at the keys
 * that we've loaded already, and then see if there's a key on disk.
 */
208
209
static signer_key_t *
keythatsigned(dns_rdata_generic_sig_t *sig) {
210
	char *keyname;
211
	isc_result_t result;
212
213
214
	dst_key_t *pubkey = NULL, *privkey = NULL;
	signer_key_t *key;

215
	keyname = nametostr(&sig->signer);
216
217
218
219
220
221
222

	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;
223
		key = ISC_LIST_NEXT(key, link);
224
	}
225

226
227
228
229
	result = dst_key_fromfile(keyname, sig->keyid, sig->algorithm,
				  DST_TYPE_PUBLIC, mctx, &pubkey);
	if (result != ISC_R_SUCCESS)
		return (NULL);
230

231
232
233
234
235
	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
236
				  DST_TYPE_PRIVATE, mctx, &privkey);
237
238
239
240
241
242
243
244
245
	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;
246
247
}

248
249
250
251
252
/*
 * Check to see if we expect to find a key at this name.  If we see a SIG
 * and can't find the signing key that we expect to find, we drop the sig.
 * I'm not sure if this is completely correct, but it seems to work.
 */
253
254
255
static isc_boolean_t
expecttofindkey(dns_name_t *name, dns_db_t *db, dns_dbversion_t *version) {
	unsigned int options = DNS_DBFIND_NOWILD;
256
	dns_fixedname_t fname;
257
258
	isc_result_t result;

259
	dns_fixedname_init(&fname);
260
	result = dns_db_find(db, name, version, dns_rdatatype_key, options,
261
			     0, NULL, dns_fixedname_name(&fname), NULL, NULL);
262
	switch (result) {
263
		case ISC_R_SUCCESS:
264
		case DNS_R_NXDOMAIN:
265
		case DNS_R_NXRRSET:
266
267
268
269
270
271
272
			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");
273
			return ISC_FALSE; /* removes a warning */
274
275
276
	}
}

277
static inline isc_boolean_t
278
279
setverifies(dns_name_t *name, dns_rdataset_t *set, signer_key_t *key,
	    dns_rdata_t *sig)
280
{
281
282
	isc_result_t result;
	result = dns_dnssec_verify(name, set, key->key, ISC_FALSE, mctx, sig);
283
	return (ISC_TF(result == ISC_R_SUCCESS));
284
285
286
287
288
289
290
291
292
}

#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"); \
293
	isc_buffer_init(&b, tdata->array, sizeof(tdata->array));
294

295
296
297
298
299
/*
 * Signs a set.  Goes through contortions to decide if each SIG should
 * be dropped or retained, and then determines if any new SIGs need to
 * be generated.
 */
300
301
302
303
304
305
306
307
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;
308
	dns_rdata_generic_sig_t sig;
309
	signer_key_t *key;
310
	isc_result_t result;
311
	isc_boolean_t notsigned = ISC_TRUE, nosigs = ISC_FALSE;
312
313
314
	isc_boolean_t wassignedby[256], nowsignedby[256];
	signer_array_t *tdata;
	ISC_LIST(signer_array_t) arraylist;
315
	int i;
316
317
318
319
320
321
322
323
324
325

	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);
326
327
328
329
330
	if (result == ISC_R_NOTFOUND) {
		result = ISC_R_SUCCESS;
		nosigs = ISC_TRUE;
	}
	check_result(result, "dns_db_findrdataset()");
331

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

334
	if (!nosigs) {
335
336
		result = dns_rdataset_first(&oldsigset);
		while (result == ISC_R_SUCCESS) {
337
			isc_boolean_t expired, future;
338
339
340
341
342
343
344
			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");

345
346
			expired = ISC_TF(now + cycle > sig.timeexpire);
			future = ISC_TF(now < sig.timesigned);
347
348
349

			key = keythatsigned(&sig);

350
351
352
353
354
355
356
357
			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);
			}
358
			else if (key == NULL && !future &&
359
				 expecttofindkey(&sig.signer, db, version))
360
361
362
363
364
365
366
367
			{
				/* 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);
			}
368
			else if (key == NULL || future) {
369
370
371
372
373
374
				vbprintf(2, "\tsig by %s/%s/%d %s - "
					 "key not found\n",
					 expired ? "retained" : "dropped",
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
375
376
377
				if (!expired)
					keep = ISC_TRUE;
			}
378
379
380
381
			else if (issigningkey(key)) {
				if (!expired &&
				    setverifies(name, set, key, &oldsigrdata))
				{
382
383
384
385
386
					vbprintf(2,
						 "\tsig by %s/%s/%d retained\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
						 sig.keyid);
387
388
389
390
					keep = ISC_TRUE;
					wassignedby[sig.algorithm] = ISC_TRUE;
				}
				else {
391
					vbprintf(2,
392
						 "\tsig by %s/%s/%d dropped - "
393
394
395
						 "%s\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
396
397
398
						 sig.keyid,
						 expired ? "expired" :
							   "failed to verify");
399
400
401
					wassignedby[sig.algorithm] = ISC_TRUE;
					resign = ISC_TRUE;
				}
Brian Wellington's avatar
Brian Wellington committed
402
			}
403
404
405
406
			else if (iszonekey(key, db)) {
				if (!expired &&
				    setverifies(name, set, key, &oldsigrdata))
				{
407
408
409
410
411
					vbprintf(2,
						 "\tsig by %s/%s/%d retained\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
						 sig.keyid);
412
413
414
415
416
					keep = ISC_TRUE;
					wassignedby[sig.algorithm] = ISC_TRUE;
					nowsignedby[sig.algorithm] = ISC_TRUE;
				}
				else {
417
418
419
420
421
					vbprintf(2,
						 "\tsig by %s/%s/%d dropped - ",
						 "%s\n",
						 nametostr(&sig.signer),
						 algtostr(sig.algorithm),
422
423
424
						 sig.keyid,
						 expired ? "expired" :
							   "failed to verify");
425
426
427
428
429
					wassignedby[sig.algorithm] = ISC_TRUE;
					if (dst_key_isprivate(key->key))
						resign = ISC_TRUE;
				}
			}
430
			else if (!expired) {
Brian Wellington's avatar
Brian Wellington committed
431
				vbprintf(2, "\tsig by %s/%s/%d retained\n",
432
433
434
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
435
				keep = ISC_TRUE;
436
437
			}
			else {
Brian Wellington's avatar
Brian Wellington committed
438
				vbprintf(2, "\tsig by %s/%s/%d expired\n",
439
440
441
442
					 nametostr(&sig.signer),
					 algtostr(sig.algorithm),
					 sig.keyid);
			}
443
444
445
446
447
448
449
450
451
452
453
454

			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;
455
456
457
458
				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));
459
460
461
462
463
464
465
				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);
466
		}
467
		if (result == ISC_R_NOMORE)
468
469
470
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_dns_rdataset_first()/next()");
		dns_rdataset_disassociate(&oldsigset);
Brian Wellington's avatar
Brian Wellington committed
471
	}
472
473
474
475
476

	for (i = 0; i < 256; i++)
		if (wassignedby[i] != 0) {
			notsigned = ISC_FALSE;
			break;
Brian Wellington's avatar
Brian Wellington committed
477
		}
478
479
480
481
482
483
484
485

	key = ISC_LIST_HEAD(keylist);
	while (key != NULL) {
		int alg = dst_key_alg(key->key);
		if (key->isdefault &&
		    (notsigned || (wassignedby[alg] && !nowsignedby[alg])))
		{
			allocbufferandrdata;
486
487
488
489
			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));
490
			signwithkey(name, set, trdata, key->key, &b);
491
492
493
494
495
			ISC_LIST_APPEND(siglist.rdata, trdata, link);
		}
		key = ISC_LIST_NEXT(key, link);
	}

496
497
498
499
	if (!ISC_LIST_EMPTY(siglist.rdata)) {
		siglist.rdclass = set->rdclass;
		siglist.type = dns_rdatatype_sig;
		siglist.covers = set->type;
500
501
		if (endtime - starttime < set->ttl)
			siglist.ttl = endtime - starttime;
502
503
504
505
506
507
		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,
508
					    0, NULL);
509
510
511
512
513
514
		if (result == DNS_R_UNCHANGED)
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_addrdataset");
		dns_rdataset_disassociate(&sigset);
	}
	else if (!nosigs) {
515
516
517
518
519
520
#if 0
		/*
		 * If this is compiled in, running a signed set through the
		 * signer with no private keys causes DNS_R_BADDB to occur
		 * later.  This is bad.
		 */
Brian Wellington's avatar
Brian Wellington committed
521
522
523
524
525
		result = dns_db_deleterdataset(db, node, version,
					       dns_rdatatype_sig, set->type);
		if (result == ISC_R_NOTFOUND)
			result = ISC_R_SUCCESS;
		check_result(result, "dns_db_deleterdataset");
526
#endif
527
	}
528
529
530
531
532
533

	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;
534
	}
Brian Wellington's avatar
Brian Wellington committed
535

536
537
538
539
540
541
542
543
	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;
	}
}

544
/* Determine if a KEY set contains a null key */
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
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);
	}
566
	if (result != ISC_R_NOMORE)
567
568
		check_result(result, "iteration over keys");
	return (ISC_FALSE);
569
570
}

571
572
573
574
575
/*
 * Signs all records at a name.  This mostly just signs each set individually,
 * but also handles exceptional cases and adds the SIG bit to any NXTs
 * generated earlier.
 */
Brian Wellington's avatar
Brian Wellington committed
576
static void
577
signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
Brian Wellington's avatar
Brian Wellington committed
578
	 dns_name_t *name, isc_boolean_t atorigin)
Brian Wellington's avatar
Brian Wellington committed
579
580
{
	isc_result_t result;
581
582
	dns_rdata_t rdata;
	dns_rdataset_t rdataset, nsset;
Brian Wellington's avatar
Brian Wellington committed
583
	dns_rdatasetiter_t *rdsiter;
Brian Wellington's avatar
Brian Wellington committed
584
	isc_boolean_t isdelegation = ISC_FALSE;
585
586
587
588
589
590
591
592
593
	static int warnwild = 0;

	if (dns_name_iswildcard(name)) {
		fprintf(stderr, "Warning: wildcard name seen: %s\n",
			nametostr(name));
		if (warnwild++ == 0)
			fprintf(stderr, "\tBIND 9 doesn't completely handle "
				"wildcards in secure zones\n");
	}
594
595
596
597
598
599
600
601
602
603
604
	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
605
606
607
608
609
610
611
	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
612

613
614
615
		/* If this is a SIG set, skip it. */
		if (rdataset.type == dns_rdatatype_sig)
			goto skip;
Brian Wellington's avatar
Brian Wellington committed
616

617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
		/* 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;
			}
636
637
		}

638
		/*
639
640
641
		 * 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
642
643
		 * SIG < NXT, the easy way works.
		 */
644
		if (rdataset.type == dns_rdatatype_nxt) {
Brian Wellington's avatar
Brian Wellington committed
645
646
647
648
649
650
651
652
653
654
655
656
657
658
			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
659

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

662
 skip:
Brian Wellington's avatar
Brian Wellington committed
663
664
665
		dns_rdataset_disassociate(&rdataset);
		result = dns_rdatasetiter_next(rdsiter);
	}
666
	if (result != ISC_R_NOMORE)
Brian Wellington's avatar
Brian Wellington committed
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
		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
691
			result = ISC_R_NOMORE;
Brian Wellington's avatar
Brian Wellington committed
692
	}
693
	if (result != ISC_R_NOMORE)
Brian Wellington's avatar
Brian Wellington committed
694
695
696
697
698
699
700
701
		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,
702
					       dns_rdatatype_nxt, 0);
Brian Wellington's avatar
Brian Wellington committed
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
		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);
}

733
734
static inline isc_result_t
next_nonglue(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter,
Brian Wellington's avatar
Brian Wellington committed
735
736
	    dns_name_t *name, dns_dbnode_t **nodep, dns_name_t *origin,
	    dns_name_t *lastcut)
737
738
739
740
741
742
{
	isc_result_t result;

	do {
		result = next_active(db, version, dbiter, name, nodep);
		if (result == ISC_R_SUCCESS) {
Brian Wellington's avatar
Brian Wellington committed
743
744
745
			if (dns_name_issubdomain(name, origin) &&
			    (lastcut == NULL ||
			     !dns_name_issubdomain(name, lastcut)))
746
747
748
749
750
751
752
753
				return (ISC_R_SUCCESS);
			dns_db_detachnode(db, nodep);
			result = dns_dbiterator_next(dbiter);
		}
	} while (result == ISC_R_SUCCESS);
	return (result);
}

754
755
756
/*
 * Generates NXTs and SIGs for each non-glue name in the zone.
 */
Brian Wellington's avatar
Brian Wellington committed
757
static void
758
signzone(dns_db_t *db, dns_dbversion_t *version) {
759
	isc_result_t result, nxtresult;
Brian Wellington's avatar
Brian Wellington committed
760
	dns_dbnode_t *node, *nextnode, *curnode;
Brian Wellington's avatar
Brian Wellington committed
761
	dns_fixedname_t fname, fnextname, fcurname;
762
	dns_name_t *name, *nextname, *target, *curname, *lastcut;
Brian Wellington's avatar
Brian Wellington committed
763
	dns_dbiterator_t *dbiter;
Brian Wellington's avatar
Brian Wellington committed
764
	isc_boolean_t atorigin = ISC_TRUE;
Brian Wellington's avatar
Brian Wellington committed
765
	dns_name_t *origin;
766
767
768
769
	dns_rdataset_t soaset;
	dns_rdata_t soarr;
	dns_rdata_soa_t soa;
	dns_ttl_t zonettl;
Brian Wellington's avatar
Brian Wellington committed
770
771
772
773
774

	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
775
776
	dns_fixedname_init(&fcurname);
	curname = dns_fixedname_name(&fcurname);
Brian Wellington's avatar
Brian Wellington committed
777

778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
	origin = dns_db_origin(db);

	dns_rdataset_init(&soaset);
	result = dns_db_find(db, origin, version, dns_rdatatype_soa,
			     0, 0, NULL, name, &soaset, NULL);
	check_result(result, "dns_db_find");
	result = dns_rdataset_first(&soaset);
	check_result(result, "dns_rdataset_first");
	dns_rdataset_current(&soaset, &soarr);
	result = dns_rdata_tostruct(&soarr, &soa, mctx);
	check_result(result, "dns_rdataset_tostruct");
	zonettl = soa.minimum;
	dns_rdata_freestruct(&soa);
	dns_rdataset_disassociate(&soaset);

793
	lastcut = NULL;
Brian Wellington's avatar
Brian Wellington committed
794
795
796
797
798
	dbiter = NULL;
	result = dns_db_createiterator(db, ISC_FALSE, &dbiter);
	check_result(result, "dns_db_createiterator()");
	result = dns_dbiterator_first(dbiter);
	node = NULL;
Brian Wellington's avatar
Brian Wellington committed
799
800
801
	dns_name_clone(origin, name);
	result = next_nonglue(db, version, dbiter, name, &node, origin,
			      lastcut);
Brian Wellington's avatar
Brian Wellington committed
802
803
804
	while (result == ISC_R_SUCCESS) {
		nextnode = NULL;
		curnode = NULL;
Brian Wellington's avatar
Brian Wellington committed
805
		dns_dbiterator_current(dbiter, &curnode, curname);
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
		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
841
842
		result = dns_dbiterator_next(dbiter);
		if (result == ISC_R_SUCCESS)
843
			result = next_nonglue(db, version, dbiter, nextname,
Brian Wellington's avatar
Brian Wellington committed
844
					      &nextnode, origin, lastcut);
Brian Wellington's avatar
Brian Wellington committed
845
846
		if (result == ISC_R_SUCCESS)
			target = nextname;
847
		else if (result == ISC_R_NOMORE)
Brian Wellington's avatar
Brian Wellington committed
848
			target = origin;
Brian Wellington's avatar
Brian Wellington committed
849
850
851
852
		else {
			target = NULL;	/* Make compiler happy. */
			fatal("db iteration failed");
		}
853
		nxtresult = dns_buildnxt(db, version, node, target, zonettl);
854
		check_result(nxtresult, "dns_buildnxt()");
Brian Wellington's avatar
Brian Wellington committed
855
		signname(db, version, node, curname, atorigin);
856
		atorigin = ISC_FALSE;
Brian Wellington's avatar
Brian Wellington committed
857
858
859
860
		dns_db_detachnode(db, &node);
		dns_db_detachnode(db, &curnode);
		node = nextnode;
	}
861
	if (result != ISC_R_NOMORE)
Brian Wellington's avatar
Brian Wellington committed
862
		fatal("db iteration failed");
863
864
865
866
	if (lastcut != NULL) {
		dns_name_free(lastcut, mctx);
		isc_mem_put(mctx, lastcut, sizeof(dns_name_t));
	}
Brian Wellington's avatar
Brian Wellington committed
867
	dns_dbiterator_destroy(&dbiter);
868
869
870
}

static void
871
loadzone(char *file, char *origin, dns_zone_t **zone) {
872
873
874
875
876
877
878
	isc_buffer_t b, b2;
	unsigned char namedata[1024];
	int len;
	dns_name_t name;
	isc_result_t result;

	len = strlen(origin);
879
	isc_buffer_init(&b, origin, len);
880
881
	isc_buffer_add(&b, len);

882
	isc_buffer_init(&b2, namedata, sizeof(namedata));
883
884
885
886
887

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

888
889
	result = dns_zone_create(zone, mctx);
	check_result(result, "dns_zone_create()");
890

891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
	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()");
915
916
917
918
919

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

920
921
922
923
/*
 * Finds all public zone keys in the zone, and attempts to load the
 * private keys from disk.
 */
924
925
926
927
928
929
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];
930
	unsigned int nkeys, i;
931
932
933
934
935
936
937
938
939

	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);
940
941
	if (result == ISC_R_NOTFOUND)
		result = ISC_R_SUCCESS;
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
	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);
}

958
959
960
961
962
963
964
965
966
967
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);
	}
968
	result = dns_zone_dumptostream(zone, fp);
969
970
971
	check_result(result, "dns_zone_dump");
	fclose(fp);
}
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003

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
1004
	fprintf(stderr, "Options: (default value in parenthesis) \n");
1005
	fprintf(stderr, "\t-s YYYYMMDDHHMMSS|+offset:\n");
1006
	fprintf(stderr, "\t\tSIG start time - absolute|offset (now)\n");
1007
	fprintf(stderr, "\t-e YYYYMMDDHHMMSS|+offset|\"now\"+offset]:\n");
1008
1009
1010
1011
1012
1013
	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");
	fprintf(stderr, "\t-o origin:\n");
Brian Wellington's avatar
Brian Wellington committed
1014
	fprintf(stderr, "\t\tzone origin (name of zonefile)\n");
1015
1016
1017
	fprintf(stderr, "\t-f outfile:\n");
	fprintf(stderr, "\t\tfile the signed zone is written in " \
			"(zonefile + .signed)\n");
1018
1019
	fprintf(stderr, "\t-a:\n");
	fprintf(stderr, "\t\tverify generated signatures (if currently valid)\n");
1020
1021
1022

	fprintf(stderr, "\n");

1023
1024
	fprintf(stderr, "Signing Keys: ");
	fprintf(stderr, "(default: all zone keys that have private keys)\n");
1025
1026
1027
1028
1029
1030
1031
	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");
	exit(0);
Brian Wellington's avatar
Brian Wellington committed
1032
1033
1034
1035
}

int
main(int argc, char *argv[]) {
1036
1037
1038
1039
	int i, ch;
	char *startstr = NULL, *endstr = NULL;
	char *origin = NULL, *file = NULL, *output = NULL;
	char *endp;
1040
	dns_zone_t *zone;
1041
1042
1043
	dns_db_t *db;
	dns_dbversion_t *version;
	signer_key_t *key;
Brian Wellington's avatar
Brian Wellington committed
1044
	isc_result_t result;
1045
	isc_log_t *log = NULL;
1046
	isc_logconfig_t *logconfig;
Brian Wellington's avatar
Brian Wellington committed
1047
1048
1049
1050
1051
1052

	dns_result_register();

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

1053
	while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:ah")) != -1)
Brian Wellington's avatar
Brian Wellington committed
1054
	{
1055
1056
		switch (ch) {
		case 's':
1057
1058
			startstr = isc_mem_strdup(mctx,
						  isc_commandline_argument);
1059
1060
1061
1062
1063
			if (startstr == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'e':
1064
1065
			endstr = isc_mem_strdup(mctx,
						isc_commandline_argument);
1066
1067
1068
1069
1070
1071
			if (endstr == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'c':
			endp = NULL;
1072
			cycle = strtol(isc_commandline_argument, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1073
			if (*endp != '\0')
1074
1075
1076
1077
1078
				check_result(ISC_R_FAILURE, "strtol()");
			break;

		case 'v':
			endp = NULL;
1079
			verbose = strtol(isc_commandline_argument, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1080
			if (*endp != '\0')
1081
1082
1083
1084
				check_result(ISC_R_FAILURE, "strtol()");
			break;

		case 'o':
1085
1086
			origin = isc_mem_strdup(mctx,
						isc_commandline_argument);
1087
1088
1089
1090
1091
			if (origin == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

		case 'f':
1092
1093
			output = isc_mem_strdup(mctx,
						isc_commandline_argument);
1094
1095
1096
1097
			if (output == NULL)
				check_result(ISC_R_FAILURE, "isc_mem_strdup()");
			break;

1098
1099
1100
1101
		case 'a':
			tryverify = 1;
			break;

1102
		case 'h':
1103
		default:
1104
1105
1106
1107
1108
			usage();

		}
	}

1109
	isc_stdtime_get(&now);
1110
1111

	if (startstr != NULL) {
1112
		starttime = strtotime(startstr, now, now);
1113
1114
1115
		isc_mem_free(mctx, startstr);
	}
	else
1116
		starttime = now;
1117
1118

	if (endstr != NULL) {
1119
		endtime = strtotime(endstr, now, starttime);
1120
1121
1122
		isc_mem_free(mctx, endstr);
	}
	else
1123
		endtime = starttime + (30 * 24 * 60 * 60);
1124
1125

	if (cycle == -1) {
1126
		cycle = (endtime - starttime) / 4;
1127
1128
	}

1129
	if (verbose > 0) {
1130
1131
1132
1133
		RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig)
			      == ISC_R_SUCCESS);
		dns_log_init(log);
		RUNTIME_CHECK(isc_log_usechannel(logconfig, "default_stderr",
1134
1135
1136
						 NULL, NULL) == ISC_R_SUCCESS);
	}

1137
1138
	argc -= isc_commandline_index;
	argv += isc_commandline_index;
1139
1140

	if (argc < 1)
1141
		usage();
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157

	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);
	}

1158
1159
1160
1161
1162
1163
1164
1165
	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, ".");
	}
1166

1167
1168
1169
	zone = NULL;
	loadzone(file, origin, &zone);

1170
1171
	db = NULL;
	version = NULL;
1172
	getdb(zone, &db, &version);
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188

	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;
1189
			char *idstr = NULL, *name = NULL, *algstr = NULL, *s;
1190
1191
1192
1193
1194

			idstr = argv[i];
			algstr = strchr(idstr, '/');
			if (algstr != NULL) {
				*algstr++ = 0;
1195
1196
1197
1198
1199
1200
1201
				s = strchr(algstr, '/');
				if (s != NULL) {
					*s++ = 0;
					name = idstr;
					idstr = algstr;
					algstr = s;
				}
1202
1203
1204
1205
			}

			endp = NULL;
			id = strtol(idstr, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1206
			if (*endp != '\0')
1207
1208
1209
1210
				check_result(ISC_R_FAILURE, "strtol");

			if (algstr != NULL) {
				endp = NULL;
1211
				alg = strtol(algstr, &endp, 0);
Brian Wellington's avatar
Brian Wellington committed
1212
				if (*endp != '\0')
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
					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");
1232
1233
					if (alg == 0)
						alg = dst_key_alg(dkey);
1234
1235
					break;
				}
Brian Wellington's avatar
Brian Wellington committed
1236
				key = ISC_LIST_NEXT(key, link);
1237
			}
1238
			if (key == NULL && alg != 0) {
1239
1240
1241
1242
1243
				dst_key_t *dkey = NULL;
				result = dst_key_fromfile(name, id, alg,
							  DST_TYPE_PRIVATE,
							  mctx, &dkey);
				check_result (result, "dst_key_fromfile");
1244
1245
1246
1247
				key = isc_mem_get(mctx, sizeof(signer_key_t));
				if (key == NULL)
					check_result(ISC_R_FAILURE,
						     "isc_mem_get");
1248
1249
1250
1251
				key->key = dkey;
				key->isdefault = ISC_TRUE;
				ISC_LIST_APPEND(keylist, key, link);
			}
1252
1253
			else
				printf("Ignoring key with algorithm 0\n");
1254
1255
1256
1257
1258
1259
1260
		}
	}

	signzone(db, version);

	/* should we update the SOA serial? */
	dns_db_closeversion(db, &version, ISC_TRUE);
1261
	dumpzone(zone, output);
1262
	dns_db_detach(&db);
1263
	dns_zone_detach(&zone);
1264
1265
1266
1267
1268
1269
1270
1271

	key = ISC_LIST_HEAD(keylist);
	while (key != NULL) {
		signer_key_t *next = ISC_LIST_NEXT(key, link);
		dst_key_free(key->key);
		isc_mem_put(mctx, key, sizeof(signer_key_t));
		key = next;
	}
Brian Wellington's avatar
Brian Wellington committed
1272

1273
	isc_mem_free(mctx, origin);
1274
1275
	isc_mem_free(mctx, file);
	isc_mem_free(mctx, output);
Brian Wellington's avatar
Brian Wellington committed
1276

1277
1278
	if (log != NULL)
		isc_log_destroy(&log);
1279
/*	isc_mem_stats(mctx, stdout);*/
Brian Wellington's avatar
Brian Wellington committed
1280
1281
1282
1283
	isc_mem_destroy(&mctx);

	return (0);
}