diff options
| author | Hans Nilsson <[email protected]> | 2019-03-19 13:26:04 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-03-21 14:46:30 +0100 |
| commit | 2bd5ed8f2ec254e637605d0a8bc081fc88faf1ed (patch) | |
| tree | 5f5e165fb36f8148af1fd818059be4aa6a4d942a /lib/crypto/c_src/openssl_config.h | |
| parent | 949ddf13286ebe10a40f2010d94d238650f6562b (diff) | |
| download | otp-2bd5ed8f2ec254e637605d0a8bc081fc88faf1ed.tar.gz otp-2bd5ed8f2ec254e637605d0a8bc081fc88faf1ed.tar.bz2 otp-2bd5ed8f2ec254e637605d0a8bc081fc88faf1ed.zip | |
crypto: Handle additional OPENSSL_NO_* flags
OPENSSL_NO_MD4
OPENSSL_NO_MD5
OPENSSL_NO_RC2
OPENSSL_NO_RC4
OPENSSL_NO_RMD160
OPENSSL_NO_CMAC
OPENSSL_NO_CHACHA
Diffstat (limited to 'lib/crypto/c_src/openssl_config.h')
| -rw-r--r-- | lib/crypto/c_src/openssl_config.h | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h index 46868cb987..ea2c0a2cfb 100644 --- a/lib/crypto/c_src/openssl_config.h +++ b/lib/crypto/c_src/openssl_config.h @@ -166,6 +166,27 @@ # define HAVE_BLAKE2 #endif +#ifndef OPENSSL_NO_MD4 +# define HAVE_MD4 +#endif + +#ifndef OPENSSL_NO_MD5 +# define HAVE_MD5 +#endif + +#ifndef OPENSSL_NO_RC2 +# define HAVE_RC2 +#endif + +#ifndef OPENSSL_NO_RC4 +# define HAVE_RC4 +#endif + +#ifndef OPENSSL_NO_RMD160 +# define HAVE_RMD160 +#endif + + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ && !defined(OPENSSL_NO_EC) \ && !defined(OPENSSL_NO_ECDH) \ @@ -192,7 +213,9 @@ # define HAVE_AEAD # define HAVE_GCM # define HAVE_CCM -# define HAVE_CMAC +# ifndef OPENSSL_NO_CMAC +# define HAVE_CMAC +# endif # if defined(RSA_PKCS1_OAEP_PADDING) # define HAVE_RSA_OAEP_PADDING # endif @@ -204,21 +227,27 @@ #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,0) # ifndef HAS_LIBRESSL -# define HAVE_CHACHA20_POLY1305 +# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) +# define HAVE_CHACHA20_POLY1305 +# endif # define HAVE_RSA_OAEP_MD # endif #endif #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(1,1,0,'d') # ifndef HAS_LIBRESSL -# define HAVE_CHACHA20 +# ifndef OPENSSL_NO_CHACHA +# define HAVE_CHACHA20 +# endif # endif #endif // OPENSSL_VERSION_NUMBER >= 1.1.1-pre8 #if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1)-7) # ifndef HAS_LIBRESSL -# define HAVE_POLY1305 +# if !defined(OPENSSL_NO_POLY1305) +# define HAVE_POLY1305 +# endif # endif #endif |