Merge pull request #1300 from paullouisageneau/fix-openssl-atexit

paullouisageneau · web-flow · commit f3db768f19f0 · 2024-12-04T10:17:05.000+01:00
Fix possible race condition at exit with OpenSSL
diff --git a/src/impl/tls.cpp b/src/impl/tls.cpp
@@ -158,7 +158,11 @@ void init() {
 
 	std::lock_guard lock(mutex);
 	if (!std::exchange(done, true)) {
-		OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);
+		uint64_t ssl_opts = OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS;
+#ifdef OPENSSL_INIT_NO_ATEXIT
+		ssl_opts |= OPENSSL_INIT_NO_ATEXIT;
+#endif
+		OPENSSL_init_ssl(ssl_opts, nullptr);
 		OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,11 @@ void init() {`
`158`	`158`
`159`	`159`	`std::lock_guard lock(mutex);`
`160`	`160`	`if (!std::exchange(done, true)) {`
`161`		`- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);`
	`161`	`+ uint64_t ssl_opts = OPENSSL_INIT_LOAD_SSL_STRINGS \| OPENSSL_INIT_LOAD_CRYPTO_STRINGS;`
	`162`	`+#ifdef OPENSSL_INIT_NO_ATEXIT`
	`163`	`+ ssl_opts \|= OPENSSL_INIT_NO_ATEXIT;`
	`164`	`+#endif`
	`165`	`+ OPENSSL_init_ssl(ssl_opts, nullptr);`
`162`	`166`	`OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, nullptr);`
`163`	`167`	`}`
`164`	`168`	`}`