diff options
| author |   tedu <tedu@openbsd.org> | 2014-07-11 15:14:33 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-07-11 15:14:33 +0000 |
| commit | 15a9b7f4cd082190b593c2407ec525d777351e6e (patch) | |
| tree | 0084ee7cd74e516fba604098e8fb010b42acc12e | |
| parent | split ext2fs_read for the upcoming ext4 extent bits, like FreeBSD has done (diff) | |
| download | wireguard-openbsd-15a9b7f4cd082190b593c2407ec525d777351e6e.tar.xz wireguard-openbsd-15a9b7f4cd082190b593c2407ec525d777351e6e.zip | |
it has been 4888 days since the transient feature to define short macros
for apps that haven't had time to make the appropriate changes was added.
time's up.
| -rw-r--r-- | lib/libcrypto/opensslfeatures.h | 59 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/opensslfeatures.h | 59 |
2 files changed, 2 insertions, 116 deletions
diff --git a/lib/libcrypto/opensslfeatures.h b/lib/libcrypto/opensslfeatures.h index 3f90e1ba437..cf7ffeac79d 100644 --- a/lib/libcrypto/opensslfeatures.h +++ b/lib/libcrypto/opensslfeatures.h @@ -17,63 +17,6 @@ # define OPENSSL_NO_STORE # define OPENSSL_NO_BUF_FREELISTS # define OPENSSL_NO_HEARTBEATS - - -# define OPENSSL_THREADS # define OPENSSL_NO_DYNAMIC_ENGINE -/* The OPENSSL_NO_* macros are also defined as NO_* if the application - asks for it. This is a transient feature that is provided for those - who haven't had the time to do the appropriate changes in their - applications. */ -#ifdef OPENSSL_ALGORITHM_DEFINES -# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) -# define NO_CAMELLIA -# endif -# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) -# define NO_EC_NISTP_64_GCC_128 -# endif -# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) -# define NO_CMS -# endif -# if defined(OPENSSL_NO_COMP) && !defined(NO_COMP) -# define NO_COMP -# endif -# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) -# define NO_GMP -# endif -# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) -# define NO_GOST -# endif -# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) -# define NO_JPAKE -# endif -# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) -# define NO_KRB5 -# endif -# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) -# define NO_MD2 -# endif -# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) -# define NO_RC5 -# endif -# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) -# define NO_RFC3779 -# endif -# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) -# define NO_SCTP -# endif -# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) -# define NO_SEED -# endif -# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) -# define NO_SRP -# endif -# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) -# define NO_SSL2 -# endif -# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) -# define NO_STORE -# endif -#endif - +# define OPENSSL_THREADS diff --git a/lib/libssl/src/crypto/opensslfeatures.h b/lib/libssl/src/crypto/opensslfeatures.h index 3f90e1ba437..cf7ffeac79d 100644 --- a/lib/libssl/src/crypto/opensslfeatures.h +++ b/lib/libssl/src/crypto/opensslfeatures.h @@ -17,63 +17,6 @@ # define OPENSSL_NO_STORE # define OPENSSL_NO_BUF_FREELISTS # define OPENSSL_NO_HEARTBEATS - - -# define OPENSSL_THREADS # define OPENSSL_NO_DYNAMIC_ENGINE -/* The OPENSSL_NO_* macros are also defined as NO_* if the application - asks for it. This is a transient feature that is provided for those - who haven't had the time to do the appropriate changes in their - applications. */ -#ifdef OPENSSL_ALGORITHM_DEFINES -# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) -# define NO_CAMELLIA -# endif -# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) -# define NO_EC_NISTP_64_GCC_128 -# endif -# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) -# define NO_CMS -# endif -# if defined(OPENSSL_NO_COMP) && !defined(NO_COMP) -# define NO_COMP -# endif -# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) -# define NO_GMP -# endif -# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) -# define NO_GOST -# endif -# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) -# define NO_JPAKE -# endif -# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) -# define NO_KRB5 -# endif -# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) -# define NO_MD2 -# endif -# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) -# define NO_RC5 -# endif -# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) -# define NO_RFC3779 -# endif -# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) -# define NO_SCTP -# endif -# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) -# define NO_SEED -# endif -# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) -# define NO_SRP -# endif -# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) -# define NO_SSL2 -# endif -# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) -# define NO_STORE -# endif -#endif - +# define OPENSSL_THREADS |