mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

pass DST_TYPE_PUBLIC | DST_TYPE_PRIVATE when both the public and private key

Browse Source 
should be read.
This commit is contained in:
Brian Wellington
2001-05-10 06:04:58 +00:00
parent 4dad906c2f
commit 1ba1b5242e
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/dnssec/dnssec-makekeyset.c
View File

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-makekeyset.c,v 1.51 2001/03/27 23:43:12 bwelling Exp $ */ /* $Id: dnssec-makekeyset.c,v 1.52 2001/05/10 06:04:56 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -298,6 +298,7 @@ main(int argc, char *argv[]) {
if (dst_key_iszonekey(key)) { if (dst_key_iszonekey(key)) {
dst_key_t *zonekey = NULL; dst_key_t *zonekey = NULL;
result = dst_key_fromnamedfile(argv[i], result = dst_key_fromnamedfile(argv[i],
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE, DST_TYPE_PRIVATE,
mctx, &zonekey); mctx, &zonekey);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)

6
bin/dnssec/dnssec-signkey.c
View File

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signkey.c,v 1.49 2001/03/27 22:57:41 bwelling Exp $ */ /* $Id: dnssec-signkey.c,v 1.50 2001/05/10 06:04:57 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -381,7 +381,9 @@ main(int argc, char *argv[]) {
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
key = NULL; key = NULL;
result = dst_key_fromnamedfile(argv[i], DST_TYPE_PRIVATE, result = dst_key_fromnamedfile(argv[i],
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE,
mctx, &key); mctx, &key);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
fatal("failed to read key %s from disk: %s", fatal("failed to read key %s from disk: %s",

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

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.137 2001/05/08 03:20:42 bwelling Exp $ */ /* $Id: dnssec-signzone.c,v 1.138 2001/05/10 06:04:58 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -223,7 +223,8 @@ keythatsigned(dns_rdata_sig_t *sig) {
return (NULL); return (NULL);
result = dst_key_fromfile(&sig->signer, sig->keyid, sig->algorithm, result = dst_key_fromfile(&sig->signer, sig->keyid, sig->algorithm,
DST_TYPE_PRIVATE, NULL, mctx, &privkey); DST_TYPE_PUBLIC | DST_TYPE_PRIVATE,
NULL, mctx, &privkey);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
dst_key_free(&pubkey); dst_key_free(&pubkey);
key = newkeystruct(privkey, ISC_FALSE); key = newkeystruct(privkey, ISC_FALSE);
@@ -1678,6 +1679,7 @@ main(int argc, char *argv[]) {
dst_key_t *newkey = NULL; dst_key_t *newkey = NULL;
result = dst_key_fromnamedfile(argv[i], result = dst_key_fromnamedfile(argv[i],
DST_TYPE_PUBLIC |
DST_TYPE_PRIVATE, DST_TYPE_PRIVATE,
mctx, &newkey); mctx, &newkey);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)