From a72248d413e927bda60e1ffa05db5ee6a18bf027 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sat, 30 May 2015 17:44:52 +1000 Subject: [PATCH] silence coverity warnings (cherry picked from commit e0fea0bf8536beca01ce36cf1863911d05d1c1ce) --- lib/dns/openssldh_link.c | 3 ++- lib/dns/openssldsa_link.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index 32cee5d97d..ae24531118 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -210,11 +210,12 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { if (dh == NULL) return (dst__openssl_toresult(ISC_R_NOMEMORY)); cb = BN_GENCB_new(); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if (cb == NULL) { DH_free(dh); return (dst__openssl_toresult(ISC_R_NOMEMORY)); } - +#endif if (callback == NULL) { BN_GENCB_set_old(cb, NULL, NULL); } else { diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c index 447951f2f1..5f1ea47075 100644 --- a/lib/dns/openssldsa_link.c +++ b/lib/dns/openssldsa_link.c @@ -377,12 +377,12 @@ openssldsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { if (dsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); cb = BN_GENCB_new(); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if (cb == NULL) { DSA_free(dsa); return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); } - - +#endif if (callback == NULL) { BN_GENCB_set_old(cb, NULL, NULL); } else {