[rtems-libbsd commit] openssl: Provide deprecated functions.

[Christian Mauderer]

Module:    rtems-libbsd
Branch:    master
Commit:    67c35b9ed16e0eb7b2ed0dd61d0baa52464526f6
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=67c35b9ed16e0eb7b2ed0dd61d0baa52464526f6

Author:    Christian Mauderer <christian.mauderer at embedded-brains.de>
Date:      Tue Mar 13 15:02:55 2018 +0100

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.

---

 libbsd.py     | 3 +--
 libbsd_waf.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libbsd.py b/libbsd.py
index f70b4ea..233c06c 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -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 7782bcc..745512b 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"]