1654. [bug] isc_result_totext() contained array bounds read

error.

1653.   [func]          Add key type checking to dst_key_fromfilename(),
                        DST_TYPE_KEY should be used to read TSIG, TKEY and
                        SIG(0) keys.

1652.   [bug]           TKEY still uses KEY.
This commit is contained in:
Mark Andrews
2004-06-11 00:31:01 +00:00
parent 6284d04192
commit 98c575983b
20 changed files with 74 additions and 48 deletions

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: keydelete.c,v 1.4.206.2 2004/03/08 02:07:49 marka Exp $ */
/* $Id: keydelete.c,v 1.4.206.3 2004/06/11 00:30:53 marka Exp $ */
#include <config.h>
@@ -154,6 +154,7 @@ main(int argc, char **argv) {
isc_logconfig_t *logconfig;
isc_task_t *task;
isc_result_t result;
int type;
RUNCHECK(isc_app_start());
@@ -222,9 +223,8 @@ main(int argc, char **argv) {
RUNCHECK(isc_app_onrun(mctx, task, sendquery, NULL));
dstkey = NULL;
result = dst_key_fromnamedfile(keyname,
DST_TYPE_PUBLIC | DST_TYPE_PRIVATE,
mctx, &dstkey);
type = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_KEY;
result = dst_key_fromnamedfile(keyname, type, mctx, &dstkey);
CHECK("dst_key_fromnamedfile", result);
result = dns_tsigkey_createfromkey(dst_key_name(dstkey),
DNS_TSIG_HMACMD5_NAME,