diff options
| author | Hans Nilsson <hans@erlang.org> | 2018-09-13 12:19:51 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2018-09-13 12:19:51 +0200 |
| commit | 6dcaba3b6ae75af4c35aff01fab7bbc777d2bba7 (patch) | |
| tree | fb9767675f3e4a5ac35564dcbd8f169281a94170 /lib/crypto | |
| parent | 9df71f46b41e34b0be5cd561533e2b3d3948dc57 (diff) | |
| parent | 304f75806ce1a2462948fc6da22b89256a501ce0 (diff) | |
| download | erlang-6dcaba3b6ae75af4c35aff01fab7bbc777d2bba7.tar.gz | |
Merge branch 'hans/crypto/SHA3/OTP-15153' into maint
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/c_src/crypto.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c index c7f36c95f1..6949df4b8e 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -149,12 +149,15 @@ #endif // SHA3: +#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1) +// An error in beta releases of 1.1.1 fixed in production release # ifdef NID_sha3_224 -//Error # define HAVE_SHA3_224 +# define HAVE_SHA3_224 # endif # ifdef NID_sha3_256 -//Error # define HAVE_SHA3_256 +# define HAVE_SHA3_256 # endif +#endif # ifdef NID_sha3_384 # define HAVE_SHA3_384 # endif |