Do not assign NULL conditionally in OpenSSL < 1.1, make it always explicit.

diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index c1a3aa27a42aca255c3808b3efa58442eecced1a..c9cb939dd657625d452f4bdd8cc8090e84f19228 100644 (file)
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dst_openssl.h,v 1.11 2011/03/12 04:59:48 tbox Exp $ */
-
 #ifndef DST_OPENSSL_H
 #define DST_OPENSSL_H 1
 
@@ -41,7 +39,7 @@
  *              _cb;
  * #endif
  */
-#define BN_GENCB_free(x) (x = NULL);
+#define BN_GENCB_free(x) ((void)0)
 #define BN_GENCB_new() (&_cb)
 #define BN_GENCB_get_arg(x) ((x)->arg)
 #endif

diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 72ac350f2001d428223556865cc521c53ccc81eb..e74bee2e2d83b24d47a31444b4740e913c6751d3 100644 (file)
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -25,7 +25,6 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $
  */
 
 #ifdef OPENSSL
@@ -308,6 +307,7 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) {
                                        DST_R_OPENSSLFAILURE));
                }
                BN_GENCB_free(cb);
+               cb = NULL;
 #else
                dh = DH_generate_parameters(key->key_size, generator,
                                            NULL, NULL);

diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index f628d9d660a3fbe98f39de6d335f019e7ab6fbe6..1c541ae73a8e55a970a67c36f492137d222580b9 100644 (file)
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -487,6 +487,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (*callback)(int)) {
                                               DST_R_OPENSSLFAILURE));
        }
        BN_GENCB_free(cb);
+       cb = NULL;
 #else
        dsa = DSA_generate_parameters(key->key_size, rand_array,
                                      ISC_SHA1_DIGESTLENGTH, NULL, NULL,

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index f62fae70cd1d9895cf2927bd8422e218d5761342..fd6add864ca72c9e7eb01a58105afd7aff66fe61 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1043,6 +1043,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
        if (RSA_generate_key_ex(rsa, key->key_size, e, cb)) {
                BN_free(e);
                BN_GENCB_free(cb);
+               cb = NULL;
                SET_FLAGS(rsa);
 #if USE_EVP
                key->keydata.pkey = pkey;
@@ -1065,8 +1066,10 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
                BN_free(e);
        if (rsa != NULL)
                RSA_free(rsa);
-       if (cb != NULL)
+       if (cb != NULL) {
                BN_GENCB_free(cb);
+               cb = NULL;
+       }
        return (dst__openssl_toresult(ret));
 #else
        RSA *rsa;