From 65b1ff4a14b44c293d5488c68502e50e8f05981e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 14 Feb 2016 19:37:10 +0100 Subject: [PATCH] Don't use libcrypto private headers with mkdef.pl Three header files from crypto/include/internal were used by util/mkdef.pl. This should never be needed. Some test program used these, which made it a valid reason at the time to make the some internal symbols public in the shared libraries, but that's not the case any more. However, to be able to link libssl.so, some symbols found in include/internal headers still need to be made public. Reviewed-by: Andy Polyakov --- util/mkdef.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/mkdef.pl b/util/mkdef.pl index b5ebc18b8e..2de27c078a 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -234,10 +234,9 @@ my $ssl="include/openssl/ssl.h"; $ssl.=" include/openssl/tls1.h"; $ssl.=" include/openssl/srtp.h"; +# We use headers found in include/openssl and include/internal only. +# The latter is needed so libssl.so/.dll/.exe can link properly. my $crypto ="include/openssl/crypto.h"; -$crypto.=" crypto/include/internal/cryptlib.h"; -$crypto.=" crypto/include/internal/chacha.h"; # unless $no_chacha; -$crypto.=" crypto/include/internal/poly1305.h"; # unless $no_poly1305; $crypto.=" include/internal/o_dir.h"; $crypto.=" include/internal/o_str.h"; $crypto.=" include/openssl/des.h" ; # unless $no_des; -- GitLab