Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up crypto_compat_free() #591

Merged
merged 2 commits into from
Oct 21, 2023
Merged

Clean up crypto_compat_free() #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5df014
crypto_compat_free(): handle recent OpenSSL and LibreSSL
gperciva Oct 15, 2023
dd6ba67
crypto_compat_free(): remove NEED_EVP_CLEANUP
gperciva Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions lib/crypto/crypto_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
/* Compatibility for LibreSSL 2.7.0+: pretend to be OpenSSL 1.1.0. */
#define OPENSSL_VERSION_NUMBER 0x1010000fL

/*
* To free the shared memory in 2.7.0+, we need to run EVP_cleanup() in
* crypto_compat_free(). This function is documented as being deprecated on
* LibreSSL 2.7.0+ (and a no-op on OpenSSL 1.1.0+), but LibreSSL's
* crypto/evp/names.c clearly shows that EVP_cleanup() does stuff, and
* valgrind memory checks show that we need to call it manually.
* (Checked in LibreSSL 2.7.0 and 3.4.2.)
*/
#define NEED_EVP_CLEANUP

#else
/* Compatibility for LibreSSL before 2.7.0: pretend to be OpenSSL 1.0.1g. */
#define OPENSSL_VERSION_NUMBER 0x1000107fL
Expand Down Expand Up @@ -255,23 +245,34 @@ void
crypto_compat_free(void)
{

#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x1010000fL
/* OpenSSL 1.1.0 and higher: do nothing; the library uses atexit(). */
#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER > 0x3070100fL
/* LibreSSL 3.7.1 and higher. */
OPENSSL_cleanup();
#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER > 0x3060000fL
/* LibreSSL 3.6.0 to 3.7.0. */
OPENSSL_cleanup();
CRYPTO_cleanup_all_ex_data();
#else
/* Easerlier versions of OpenSSL and LibreSSL. */

/* Free OpenSSL error queue. */
#if OPENSSL_VERSION_NUMBER < 0x10000000L
ERR_remove_state(0);
#elif OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_remove_thread_state(NULL);
#else
/* Nothing needed for OpenSSL >= 1.1. */
#endif

/* Free OpenSSL error strings. */
ERR_free_strings();

#ifdef NEED_EVP_CLEANUP
/* Additional cleaning needed for some versions of LibreSSL. */
#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL
/* Additional cleaning needed for LibreSSL 2.7.0 to 3.5.x. */
EVP_cleanup();
#endif

/* A more general OpenSSL cleanup function. */
CRYPTO_cleanup_all_ex_data();
#endif
}