From: Matt Caswell <matt@openssl.org>
Date: Mon, 22 Mar 2021 11:26:04 +0000 (+0000)
Subject: Be more selective about copying libcrypto symbols into legacy.so
X-Git-Tag: openssl-3.0.0-alpha14~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a669418c8eb64d0e3cb62af1794949066a253039;p=thirdparty%2Fopenssl.git

Be more selective about copying libcrypto symbols into legacy.so

Some private libcrypto symbols are also included in legacy.so.
Unfortunately this included some files with "RUN_ONCE" functions and
global data. This doesn't get properly cleaned up when OpenSSL exits.
Therefore we are more selective about the symbols we include in legacy.so.

Fixes #13560

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14646)
---

diff --git a/crypto/build.info b/crypto/build.info
index 7fe79e2296f..dc180d02523 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -81,7 +81,7 @@ SOURCE[../libcrypto]=$UTIL_COMMON \
         punycode.c \
         $UPLINKSRC
 SOURCE[../providers/libfips.a]=$UTIL_COMMON
-SOURCE[../providers/liblegacy.a]=$UTIL_COMMON
+SOURCE[../providers/liblegacy.a]=cryptlib.c $CPUIDASM ctype.c
 
 # Implementations are now spread across several libraries, so the defines
 # need to be applied to all affected libraries and modules.