Skip to content

michal/crypto/fix-aead-cipher-key-buffer-overread/OTP-20244 #11337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mikaka27 wants to merge 1 commit into
base: maint
Choose a base branch
from
+64 −11
Open

michal/crypto/fix-aead-cipher-key-buffer-overread/OTP-20244 #11337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/crypto/c_src/aead.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ ERL_NIF_TERM aead_cipher_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
if ((ctx_res = enif_alloc_resource(aead_cipher_ctx_rtype, sizeof(struct aead_cipher_ctx))) == NULL)
return EXCP_ERROR(env, "Can't allocate resource");

ctx_res->ctx = NULL;
ctx_res->env = enif_alloc_env();
encflg_arg = argv[3];

Expand Down Expand Up @@ -133,6 +134,9 @@ ERL_NIF_TERM aead_cipher_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
{ret = EXCP_ERROR(env, "Can't allocate ctx"); goto done;}
if (EVP_CipherInit_ex(ctx_res->ctx, ctx_res->cipherp->cipher.p, NULL, NULL, NULL, ctx_res->encflg) != 1)
{ret = EXCP_ERROR(env, "CipherInit failed"); goto done;}
if (!EVP_CIPHER_CTX_set_key_length(ctx_res->ctx, (int)key.size))
{ret = EXCP_BADARG_N(env, 1, "Bad Key length"); goto done;}


ret = enif_make_resource(env, ctx_res);

Expand Down Expand Up @@ -232,6 +236,8 @@ ERL_NIF_TERM aead_cipher_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
{ret = EXCP_ERROR(env, "Can't allocate ctx"); goto done;}
if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, encflg) != 1)
{ret = EXCP_ERROR(env, "CipherInit failed"); goto done;}
if (!EVP_CIPHER_CTX_set_key_length(ctx, (int)key.size))
{ret = EXCP_BADARG_N(env, 1, "Bad Key length"); goto done;}

} else {
/* argc = 4 {state, IV, InData, AAD } */
Expand Down
2 changes: 1 addition & 1 deletion lib/crypto/c_src/cipher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static struct cipher_type_t cipher_types[] =

/*==== AEAD ciphers ====*/
#if defined(HAVE_CHACHA20_POLY1305)
{{"chacha20_poly1305"}, "chacha20-poly1305", {&EVP_chacha20_poly1305}, 0, NO_FIPS_CIPHER | AEAD_CIPHER, AEAD_CTRL},
{{"chacha20_poly1305"}, "chacha20-poly1305", {&EVP_chacha20_poly1305}, 32, NO_FIPS_CIPHER | AEAD_CIPHER, AEAD_CTRL},
#else
{{"chacha20_poly1305"}, "chacha20-poly1305", {NULL}, 0, NO_FIPS_CIPHER | AEAD_CIPHER, {{0,0,0}}},
#endif
Expand Down
67 changes: 57 additions & 10 deletions lib/crypto/test/crypto_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@
end_per_testcase/2,

%% Test cases:
aead_bad_tag/1,
aead_ng/1,
aead_bad_tag/1,
aead_bad_key_length/1,
all_ciphers/1,
api_errors_ecdh/1,
api_ng/0,
Expand Down Expand Up @@ -462,9 +463,9 @@ groups() ->
{sm4_ofb, [], [api_ng, api_ng_one_shot]},
{sm4_cfb, [], [api_ng, api_ng_one_shot]},
{sm4_ctr, [], [api_ng, api_ng_one_shot]},
{sm4_gcm, [], [aead_ng, aead_bad_tag]},
{sm4_ccm, [], [aead_ng, aead_bad_tag]},
{chacha20_poly1305, [], [aead_ng, aead_bad_tag]},
{sm4_gcm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{sm4_ccm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{chacha20_poly1305, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{chacha20, [], [api_ng, api_ng_one_shot]},
{poly1305, [], [poly1305]},
{no_poly1305, [], [no_poly1305]},
Expand Down Expand Up @@ -510,15 +511,15 @@ groups() ->
{aes_128_ctr, [], [api_ng, api_ng_one_shot]},
{aes_192_ctr, [], [api_ng, api_ng_one_shot]},
{aes_256_ctr, [], [api_ng, api_ng_one_shot]},
{aes_128_ccm, [], [aead_ng, aead_bad_tag]},
{aes_192_ccm, [], [aead_ng, aead_bad_tag]},
{aes_256_ccm, [], [aead_ng, aead_bad_tag]},
{aes_128_ccm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_192_ccm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_256_ccm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_128_ecb, [], [api_ng, api_ng_one_shot]},
{aes_192_ecb, [], [api_ng, api_ng_one_shot]},
{aes_256_ecb, [], [api_ng, api_ng_one_shot]},
{aes_128_gcm, [], [aead_ng, aead_bad_tag]},
{aes_192_gcm, [], [aead_ng, aead_bad_tag]},
{aes_256_gcm, [], [aead_ng, aead_bad_tag]},
{aes_128_gcm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_192_gcm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_256_gcm, [], [aead_ng, aead_bad_tag, aead_bad_key_length]},
{aes_128_ofb, [], [api_ng, api_ng_one_shot]},
{aes_192_ofb, [], [api_ng, api_ng_one_shot]},
{aes_256_ofb, [], [api_ng, api_ng_one_shot]}
Expand Down Expand Up @@ -1136,6 +1137,23 @@ aead_bad_tag(Config) ->
end,
do_cipher_tests(fun aead_cipher_bad_tag/1, FilteredAEADs).

%%--------------------------------------------------------------------
aead_bad_key_length(Config) ->
[_|_] = AEADs = lazy_eval(proplists:get_value(cipher, Config)),
FilteredAEADs =
case proplists:get_bool(fips, Config) of
false ->
AEADs;
true ->
%% In FIPS mode, the IV length must be at least 12 bytes.
lists:filter(
fun(Tuple) ->
IVLen = byte_size(element(4, Tuple)),
IVLen >= 12
end, AEADs)
end,
do_cipher_tests(fun aead_cipher_bad_key_length/1, FilteredAEADs).

%%--------------------------------------------------------------------
sign_verify() ->
[{doc, "Sign/verify digital signatures"}].
Expand Down Expand Up @@ -1811,6 +1829,35 @@ aead_cipher_bad_tag({Type, Key, _PlainText, IV, AAD, CipherText, CipherTag, TagL
fun() -> crypto:crypto_one_time_aead(Type, Key, IV, CipherText, AAD, BadTruncatedTag, false) end,
error).

aead_cipher_bad_key_length({Type, Key, PlainText, IV, AAD, _CipherText, _CipherTag, _Info}=T) ->
F = fun(K) ->
try crypto:crypto_one_time_aead(Type, K, IV, PlainText, AAD, true) of
Res -> ct:fail("Call should fail, but succeeded with return: ~p~n", [Res])
catch error : {badarg, _, _} -> ok
end
end,
KeyExtended = <<Key/binary, <<1>>/binary>>,
F(KeyExtended),
KeyTruncatedSize = byte_size(Key) - 1,
<<KeyTruncated:KeyTruncatedSize/binary, _/binary>> = Key,
F(KeyTruncated);
aead_cipher_bad_key_length({Type, Key, PlainText, IV, AAD, _CipherText, _CipherTag, TagLen, _Info}=T) ->
F = fun(K) ->
try crypto:crypto_one_time_aead(Type, K, IV, PlainText, AAD, TagLen, true) of
Res1 -> ct:fail("Call should fail, but succeeded with return: ~p~n", [Res1])
catch error : {badarg, _, _} -> ok
end,
try crypto:crypto_one_time_aead_init(Type, K, TagLen, true) of
Res2 -> ct:fail("Call should fail, but succeeded with return: ~p~n", [Res2])
catch error : {badarg, _, _} -> ok
end
end,
KeyExtended = <<Key/binary, <<1>>/binary>>,
F(KeyExtended),
KeyTruncatedSize = byte_size(Key) - 1,
<<KeyTruncated:KeyTruncatedSize/binary, _/binary>> = Key,
F(KeyTruncated).


cipher_test(T, Fe, Ee, Fd, Ed) ->
%% Test encrypt
Expand Down
Loading