diff options
| author | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2018-03-13 15:02:55 +0100 |
|---|---|---|
| committer | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2018-03-21 09:14:25 +0100 |
| commit | 67c35b9ed16e0eb7b2ed0dd61d0baa52464526f6 (patch) | |
| tree | 011ce2f200ac859b8ca78b84fb5a867978939929 | |
| parent | eae664ea8fdae9e514dc7970c6cf21a0b9767ddd (diff) | |
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.
| -rw-r--r-- | libbsd.py | 3 | ||||
| -rw-r--r-- | libbsd_waf.py | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -3614,8 +3614,7 @@ def crypto_openssl(mm): 'crypto/openssl/crypto/cversion.c', 'crypto/openssl/crypto/o_str.c', ], - mm.generator['source'](['-DOPENSSL_NO_DEPRECATED=1', - '-DOPENSSL_NO_EC_NISTP_64_GCC_128=1', + mm.generator['source'](['-DOPENSSL_NO_EC_NISTP_64_GCC_128=1', '-DOPENSSL_NO_GMP=1', '-DOPENSSL_NO_JPAKE=1', '-DOPENSSL_NO_LIBUNBOUND=1', diff --git a/libbsd_waf.py b/libbsd_waf.py index 7782bccb..745512bf 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -1317,7 +1317,7 @@ def build(bld): features = "c", 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, - 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) libbsd_use += ["objs04"] |