Changeset 67c35b9 in rtems-libbsd

Timestamp:

03/13/18 14:02:55 (6 years ago)

Author:

Christian Mauderer <christian.mauderer@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

b2a210c

Parents:

eae664e

git-author:

Christian Mauderer <christian.mauderer@…> (03/13/18 14:02:55)

git-committer:

Christian Mauderer <christian.mauderer@…> (03/21/18 08:14:25)

Message:

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.

Files:

• libbsd.py (modified) (1 diff)
• libbsd_waf.py (modified) (1 diff)

libbsd.py

@@ -3615 +3615 @@
             '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',

libbsd_waf.py

@@ -1318 +1318 @@
                 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"]