diff options
| author | Hans Nilsson <[email protected]> | 2018-09-13 12:20:03 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-09-13 12:20:03 +0200 |
| commit | ddf5ada347f3ed287524c440a6786d28e40e8144 (patch) | |
| tree | bf7972eed26875ebc24b3be8b460cf4f5cfb7a28 | |
| parent | cd0b40c28547f88d1bca1a85fba407bfead9b4d9 (diff) | |
| parent | 6dcaba3b6ae75af4c35aff01fab7bbc777d2bba7 (diff) | |
| download | otp-ddf5ada347f3ed287524c440a6786d28e40e8144.tar.gz otp-ddf5ada347f3ed287524c440a6786d28e40e8144.tar.bz2 otp-ddf5ada347f3ed287524c440a6786d28e40e8144.zip | |
Merge branch 'maint'
* maint:
crypto: sha3_224 and sha3_256 errors fixed
| -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 |