diff options
| author | Hans Nilsson <[email protected]> | 2019-03-21 15:14:19 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-03-21 15:14:19 +0100 |
| commit | e739ec80b5546e8d04f08c1f4a6c0067be2c13a7 (patch) | |
| tree | 924e44691620e506c84f483e134706d046e97aaa /lib/crypto/c_src/cipher.c | |
| parent | c75fa5f4a484bc82083b06e7d10a197b2a3fbddc (diff) | |
| parent | 7188527f1465c715c7e71e5477f4116f27202288 (diff) | |
| download | otp-e739ec80b5546e8d04f08c1f4a6c0067be2c13a7.tar.gz otp-e739ec80b5546e8d04f08c1f4a6c0067be2c13a7.tar.bz2 otp-e739ec80b5546e8d04f08c1f4a6c0067be2c13a7.zip | |
Merge branch 'hans/crypto/use_openssl_NO-flags/OTP-15683'
* hans/crypto/use_openssl_NO-flags/OTP-15683:
crypto: Fixup unused label warning
crypto: Fixup 'break strict-aliasing rules' warning
crypto: Fixup 'break strict-aliasing rules' warning
crypto: Fixup the ripemd160 macro chaos
crypto: Test suite fix for unavailable CMAC
crypto: Handle additional OPENSSL_NO_* flags
Diffstat (limited to 'lib/crypto/c_src/cipher.c')
| -rw-r--r-- | lib/crypto/c_src/cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c index 5c57898c50..9d60254a3c 100644 --- a/lib/crypto/c_src/cipher.c +++ b/lib/crypto/c_src/cipher.c @@ -28,12 +28,12 @@ static struct cipher_type_t cipher_types[] = { -#ifndef OPENSSL_NO_RC2 +#ifdef HAVE_RC2 {{"rc2_cbc"}, {&EVP_rc2_cbc}, 0, NO_FIPS_CIPHER}, #else {{"rc2_cbc"}, {NULL}, 0, NO_FIPS_CIPHER}, #endif -#ifndef OPENSSL_NO_RC4 +#ifdef HAVE_RC4 {{"rc4"}, {&EVP_rc4}, 0, NO_FIPS_CIPHER}, #else {{"rc4"}, {NULL}, 0, NO_FIPS_CIPHER}, |