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

2653. [bug] Treat ENGINE_load_private_key() failures as key

Browse Source 
not found rather than out of memory.  [RT #18033]
This commit is contained in:
Mark Andrews
2009-08-18 07:45:14 +00:00
parent 88471538d6
commit 97a2451eea
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2653. [bug] Treat ENGINE_load_private_key() failures as key
not found rather than out of memory. [RT #18033]
2652. [func] Provide more detail about what record is being
deleted. [RT #20061]

8
lib/dns/opensslrsa_link.c
View File

@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: opensslrsa_link.c,v 1.24 2009/07/19 04:18:05 each Exp $
* $Id: opensslrsa_link.c,v 1.25 2009/08/18 07:45:14 marka Exp $
*/
#ifdef OPENSSL
#ifndef USE_EVP
@@ -806,8 +806,8 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer) {
DST_RET(DST_R_NOENGINE);
pkey = ENGINE_load_private_key(e, label, NULL, NULL);
if (pkey == NULL) {
ERR_print_errors_fp(stderr);
DST_RET(ISC_R_FAILURE);
/* ERR_print_errors_fp(stderr); */
DST_RET(ISC_R_NOTFOUND);
}
key->engine = isc_mem_strdup(key->mctx, name);
if (key->engine == NULL)
@@ -925,7 +925,7 @@ opensslrsa_fromlabel(dst_key_t *key, const char *engine, const char *label,
DST_RET(DST_R_NOENGINE);
pkey = ENGINE_load_private_key(e, label, NULL, NULL);
if (pkey == NULL)
DST_RET(ISC_R_NOMEMORY);
DST_RET(ISC_R_NOTFOUND);
key->engine = isc_mem_strdup(key->mctx, label);
if (key->engine == NULL)
DST_RET(ISC_R_NOMEMORY);