diff options
| author | Hans Nilsson <[email protected]> | 2019-05-22 11:31:40 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-05-22 11:31:40 +0200 |
| commit | 51faab4ae2da244881c297205fd13ca1c5cbaec5 (patch) | |
| tree | 25f969be8254c45e80e1b7b29397a2f0a14f13dc /lib | |
| parent | 4be2f005500d1608f1b290ded0e4271885911ac3 (diff) | |
| parent | c8230dde231c3d7cc6807714eb46741006f792b8 (diff) | |
| download | otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.tar.gz otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.tar.bz2 otp-51faab4ae2da244881c297205fd13ca1c5cbaec5.zip | |
Merge branch 'maint'
* maint:
crypto: Re-enable aes_ctr for openssl cryptolib < 1.0.1
use correct module name for standard_error
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/c_src/cipher.c | 1 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.erl | 2 |
2 files changed, 2 insertions, 1 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); diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl index bfa091a036..bc4f09a023 100644 --- a/lib/kernel/src/kernel.erl +++ b/lib/kernel/src/kernel.erl @@ -116,7 +116,7 @@ init([]) -> restart => temporary, shutdown => 2000, type => supervisor, - modules => [user_sup]}, + modules => [standard_error]}, User = #{id => user, start => {user_sup, start, []}, |