diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-06-11 11:18:54 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-14 09:21:05 +1000 |
| commit | eaa39eb6782c46e13e937483e8ef2d92570d80ab (patch) | |
| tree | d1eb6d676a9edcfbab30745d4171179207dccb9c /ssl/build.info | |
| parent | cdf2986a70d92668d882eb29737225f1aaafd0f1 (diff) | |
Do not duplicate symbols between libcrypto and libssl in static builds
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15714)
Diffstat (limited to 'ssl/build.info')
| -rw-r--r-- | ssl/build.info | 15 |
1 files changed, 8 insertions, 7 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 |