From: Mark Andrews <marka@isc.org>
Date: Mon, 26 Sep 2022 01:52:55 +0000 (+1000)
Subject: Check that 'e' and 'n' are non-NULL in opensslrsa_todns
X-Git-Tag: v9.18.8~13^2~4
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3fd8d439c6cc27bdad147b3e2894b42ab92d8119;p=thirdparty%2Fbind9.git

Check that 'e' and 'n' are non-NULL in opensslrsa_todns

(cherry picked from commit 5603cd69d170f49916bec3ca78ab3e4830170950)
---

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 72a195f366a..2cbcbfde1e1 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -586,10 +586,10 @@ opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) {
 #else
 	EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &e);
 	EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &n);
+#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L || OPENSSL_API_LEVEL < 30000 */
 	if (e == NULL || n == NULL) {
 		DST_RET(dst__openssl_toresult(DST_R_OPENSSLFAILURE));
 	}
-#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L || OPENSSL_API_LEVEL < 30000 */
 
 	mod_bytes = BN_num_bytes(n);
 	e_bytes = BN_num_bytes(e);