ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

1736. [bug] dst_key_fromnamedfile() could fail to read a

Browse Source 
public key. [RT #12687]
This commit is contained in:
Mark Andrews
2004-10-01 00:10:59 +00:00
parent 314cac2365
commit 2d2e0fff8e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
1736. [bug] dst_key_fromnamedfile() could fail to read a
public key. [RT #12687]
1735. [bug] 'dig +sigtrace' could die with a REQUIRE failure.
[RE #12688]

4
lib/dns/sec/dst/dst_api.c
View File

@@ -18,7 +18,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.117 2004/06/16 01:41:52 marka Exp $
* $Id: dst_api.c,v 1.118 2004/10/01 00:10:59 marka Exp $
*/
#include <config.h>
@@ -396,7 +396,7 @@ dst_key_fromnamedfile(const char *filename, int type, isc_mem_t *mctx,
if (result != ISC_R_SUCCESS)
return (result);
if (type == DST_TYPE_PUBLIC ||
if ((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) == DST_TYPE_PUBLIC ||
(pubkey->key_flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY)
{
result = computeid(pubkey);