From 7d0a9cf7bf8da94bda970f2a11e2c4798dbec063 Mon Sep 17 00:00:00 2001 From: Grigory Starinkin Date: Wed, 15 May 2019 21:12:06 +0100 Subject: use correct module name for standard_error --- lib/kernel/src/kernel.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, []}, -- cgit v1.2.3 From 2f8ca3885a25ee4d59d0b537e73f5fbe7720b25d Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Tue, 21 May 2019 12:52:21 +0200 Subject: crypto: Re-enable aes_ctr for openssl cryptolib < 1.0.1 It was accidently disabled in the crypto:supports/0 and /1. It worked however in the encrypt/decrypt functions. --- lib/crypto/c_src/cipher.c | 1 + 1 file changed, 1 insertion(+) 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); -- cgit v1.2.3