diff options
| author | Hans Nilsson <[email protected]> | 2019-05-22 11:31:12 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-05-22 11:31:12 +0200 |
| commit | c8230dde231c3d7cc6807714eb46741006f792b8 (patch) | |
| tree | 5f0e002146694760956e0b0f63c2f42a33bd8d54 /lib | |
| parent | 02752f185b18c7f1c3f57dd80cf7c12f925dfe6a (diff) | |
| parent | 2f8ca3885a25ee4d59d0b537e73f5fbe7720b25d (diff) | |
| download | otp-c8230dde231c3d7cc6807714eb46741006f792b8.tar.gz otp-c8230dde231c3d7cc6807714eb46741006f792b8.tar.bz2 otp-c8230dde231c3d7cc6807714eb46741006f792b8.zip | |
Merge branch 'hans/crypto/enable_aes_ctr/OTP-15829' into maint
* 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.c | 1 |
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); |