openssl: Provide deprecated functions.

Some applications (like the civetweb web server) still use functions
that are deprecated by openssl. If OPENSSL_NO_DEPRECATED is defined,
openssl will not provide these functions. This patch removes the define
so that the functions are available.
This commit is contained in:
Christian Mauderer 2018-03-13 15:02:55 +01:00
parent eae664ea8f
commit 67c35b9ed1
2 changed files with 2 additions and 3 deletions

View File

@ -3614,8 +3614,7 @@ def crypto_openssl(mm):
'crypto/openssl/crypto/cversion.c', 'crypto/openssl/crypto/cversion.c',
'crypto/openssl/crypto/o_str.c', 'crypto/openssl/crypto/o_str.c',
], ],
mm.generator['source'](['-DOPENSSL_NO_DEPRECATED=1', mm.generator['source'](['-DOPENSSL_NO_EC_NISTP_64_GCC_128=1',
'-DOPENSSL_NO_EC_NISTP_64_GCC_128=1',
'-DOPENSSL_NO_GMP=1', '-DOPENSSL_NO_GMP=1',
'-DOPENSSL_NO_JPAKE=1', '-DOPENSSL_NO_JPAKE=1',
'-DOPENSSL_NO_LIBUNBOUND=1', '-DOPENSSL_NO_LIBUNBOUND=1',

View File

@ -1317,7 +1317,7 @@ def build(bld):
features = "c", features = "c",
cflags = cflags, cflags = cflags,
includes = ['freebsd/crypto', 'freebsd/crypto/openssl', 'freebsd/crypto/openssl/crypto', 'freebsd/crypto/openssl/crypto/asn1', 'freebsd/crypto/openssl/crypto/evp', 'freebsd/crypto/openssl/crypto/modes'] + includes, includes = ['freebsd/crypto', 'freebsd/crypto/openssl', 'freebsd/crypto/openssl/crypto', 'freebsd/crypto/openssl/crypto/asn1', 'freebsd/crypto/openssl/crypto/evp', 'freebsd/crypto/openssl/crypto/modes'] + includes,
defines = defines + ['NO_WINDOWS_BRAINDEATH=1', 'OPENSSL_DISABLE_OLD_DES_SUPPORT=1', 'OPENSSL_NO_DEPRECATED=1', 'OPENSSL_NO_EC_NISTP_64_GCC_128=1', 'OPENSSL_NO_GMP=1', 'OPENSSL_NO_JPAKE=1', 'OPENSSL_NO_LIBUNBOUND=1', 'OPENSSL_NO_MD2=1', 'OPENSSL_NO_RC5=1', 'OPENSSL_NO_RFC3779=1', 'OPENSSL_NO_SCTP=1', 'OPENSSL_NO_SSL2=1', 'OPENSSL_NO_SSL_TRACE=1', 'OPENSSL_NO_STORE=1', 'OPENSSL_NO_UNIT_TEST=1', 'OPENSSL_NO_WEAK_SSL_CIPHERS=1'], defines = defines + ['NO_WINDOWS_BRAINDEATH=1', 'OPENSSL_DISABLE_OLD_DES_SUPPORT=1', 'OPENSSL_NO_EC_NISTP_64_GCC_128=1', 'OPENSSL_NO_GMP=1', 'OPENSSL_NO_JPAKE=1', 'OPENSSL_NO_LIBUNBOUND=1', 'OPENSSL_NO_MD2=1', 'OPENSSL_NO_RC5=1', 'OPENSSL_NO_RFC3779=1', 'OPENSSL_NO_SCTP=1', 'OPENSSL_NO_SSL2=1', 'OPENSSL_NO_SSL_TRACE=1', 'OPENSSL_NO_STORE=1', 'OPENSSL_NO_UNIT_TEST=1', 'OPENSSL_NO_WEAK_SSL_CIPHERS=1'],
source = objs04_source) source = objs04_source)
libbsd_use += ["objs04"] libbsd_use += ["objs04"]