The branch master has been updated
via 243af566e41e33e4ce2d3afa3e6a7383e20da737 (commit)
via eaa39eb6782c46e13e937483e8ef2d92570d80ab (commit)
from cdf2986a70d92668d882eb29737225f1aaafd0f1 (commit)
- Log -----------------------------------------------------------------
commit 243af566e41e33e4ce2d3afa3e6a7383e20da737
Author: Tomas Mraz <to...@openssl.org>
Date: Fri Jun 11 12:32:39 2021 +0200
When linking to static libssl always link to static libcrypto
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15714)
commit eaa39eb6782c46e13e937483e8ef2d92570d80ab
Author: Tomas Mraz <to...@openssl.org>
Date: Fri Jun 11 11:18:54 2021 +0200
Do not duplicate symbols between libcrypto and libssl in static builds
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15714)
-----------------------------------------------------------------------
Summary of changes:
ssl/build.info | 15 ++++++++-------
test/build.info | 4 ++--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ssl/build.info b/ssl/build.info
index f2de0371ae..0851357f81 100644
--- a/ssl/build.info
+++ b/ssl/build.info
@@ -15,12 +15,8 @@ IF[{- !$disabled{ktls} -}]
$KTLSSRC=ktls.c
ENDIF
-# For now we just include the libcrypto packet.c in libssl as well. We
-# could either continue to do it like this, or export all the WPACKET
-# symbols so that libssl can use them like any other. Probably would do
-# this privately so it does not become part of the public API.
SOURCE[../libssl]=\
- pqueue.c ../crypto/packet.c \
+ pqueue.c \
statem/statem_srvr.c statem/statem_clnt.c s3_lib.c s3_enc.c
record/rec_layer_s3.c \
statem/statem_lib.c statem/extensions.c statem/extensions_srvr.c \
statem/extensions_clnt.c statem/extensions_cust.c s3_msg.c \
@@ -32,11 +28,16 @@ SOURCE[../libssl]=\
ssl_asn1.c ssl_txt.c ssl_init.c ssl_conf.c ssl_mcnf.c \
bio_ssl.c ssl_err.c ssl_err_legacy.c tls_srp.c t1_trce.c ssl_utst.c \
record/ssl3_buffer.c record/ssl3_record.c record/dtls1_bitmap.c \
- statem/statem.c record/ssl3_record_tls13.c record/tls_pad.c \
+ statem/statem.c record/ssl3_record_tls13.c \
tls_depr.c $KTLSSRC
+# For shared builds we need to include the libcrypto packet.c and sources
+# needed in providers (s3_cbc.c and record/tls_pad.c) in libssl as well.
+SHARED_SOURCE[../libssl]=record/tls_pad.c ../crypto/packet.c
IF[{- !$disabled{'deprecated-3.0'} -}]
- SOURCE[../libssl]=s3_cbc.c ssl_rsa_legacy.c
+ SHARED_SOURCE[../libssl]=s3_cbc.c
+ SOURCE[../libssl]=ssl_rsa_legacy.c
ENDIF
+
DEFINE[../libssl]=$AESDEF
SOURCE[../providers/libcommon.a]=record/tls_pad.c
diff --git a/test/build.info b/test/build.info
index b2e8e8507a..bc543bd761 100644
--- a/test/build.info
+++ b/test/build.info
@@ -624,7 +624,7 @@ IF[{- !$disabled{tests} -}]
SOURCE[tls13encryptiontest]=tls13encryptiontest.c
INCLUDE[tls13encryptiontest]=.. ../include ../apps/include
- DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
+ DEPEND[tls13encryptiontest]=../libcrypto.a ../libssl.a libtestutil.a
SOURCE[ideatest]=ideatest.c
INCLUDE[ideatest]=../include ../apps/include
@@ -632,7 +632,7 @@ IF[{- !$disabled{tests} -}]
SOURCE[wpackettest]=wpackettest.c
INCLUDE[wpackettest]=../include ../apps/include
- DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
+ DEPEND[wpackettest]=../libcrypto.a ../libssl.a libtestutil.a
SOURCE[property_test]=property_test.c
INCLUDE[property_test]=.. ../include ../apps/include
