Merge branch '4292-uncleared-libcrypto-error-crypto-evp-evp_fetch-c-373-inner_evp_generic_fetch-bind-9.18' into 'bind-9.18'

[9.18] Resolve "Uncleared libcrypto error: crypto/evp/evp_fetch.c:373 inner_evp_generic_fetch" See merge request isc-projects/bind9!8279
2023-09-06 15:47:08 +00:00
parent ad9fd9e362 7f89f2d6bc
commit 04128e764e
1 changed files with 8 additions and 2 deletions
--- a/lib/isc/md.c
+++ b/lib/isc/md.c
@@ -168,8 +168,14 @@ end:
 	return (res);
 }

-#define md_register_algorithm(alg) \
-	const isc_md_type_t *isc__md_##alg(void) { return (EVP_##alg()); }
+#define md_register_algorithm(alg)                        \
+	const isc_md_type_t *isc__md_##alg(void) {        \
+		const isc_md_type_t *value = EVP_##alg(); \
+		if (value == NULL) {                      \
+			ERR_clear_error();                \
+		}                                         \
+		return (value);                           \
+	}

 md_register_algorithm(md5);
 md_register_algorithm(sha1);