aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-05-29 13:24:40 +0200
committerErlang/OTP <[email protected]>2019-05-29 13:24:40 +0200
commitb6d769e80f9b0be730896e0a7a655d7b7344368b (patch)
treeb0d2625ff7cc42a7172aec3a6f55a02f174090af /lib
parentd32991afaf3fc5f9f73e3e2448672bb9a1b80101 (diff)
parent2f8ca3885a25ee4d59d0b537e73f5fbe7720b25d (diff)
downloadotp-b6d769e80f9b0be730896e0a7a655d7b7344368b.tar.gz
otp-b6d769e80f9b0be730896e0a7a655d7b7344368b.tar.bz2
otp-b6d769e80f9b0be730896e0a7a655d7b7344368b.zip
Merge branch 'hans/crypto/enable_aes_ctr/OTP-15829' into maint-22
* hans/crypto/enable_aes_ctr/OTP-15829: crypto: Re-enable aes_ctr for openssl cryptolib < 1.0.1
Diffstat (limited to 'lib')
-rw-r--r--lib/crypto/c_src/cipher.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c
index 00072af632..0532fb7566 100644
--- a/lib/crypto/c_src/cipher.c
+++ b/lib/crypto/c_src/cipher.c
@@ -334,6 +334,7 @@ ERL_NIF_TERM cipher_types_as_list(ErlNifEnv* env)
continue;
if ((p->cipher.p != NULL) ||
+ (p->flags & AES_CTR_COMPAT) ||
(p->type.atom == atom_aes_ige256)) /* Special handling. Bad indeed... */
{
hd = enif_make_list_cell(env, p->type.atom, hd);