QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-01 04:04:39 +00:00
Code Issues Projects Releases Wiki Activity

Add missing flags for EVP_chacha20()

Browse Source 
ChaCha20 code uses its own custom cipher_data. Add EVP_CIPH_CUSTOM_IV
and EVP_CIPH_ALWAYS_CALL_INIT so that the key and the iv can be set by
different calls of EVP_CipherInit_ex().

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2156)
This commit is contained in:
Kazuki Yamaguchi 2016-12-30 00:59:56 +09:00 committed by Richard Levitte
parent 38088ce993
commit c83680a04a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/e_chacha20_poly1305.c
View File

@ -127,7 +127,7 @@ static const EVP_CIPHER chacha20 = {
1, /* block_size */ 1, /* block_size */
CHACHA_KEY_SIZE, /* key_len */ CHACHA_KEY_SIZE, /* key_len */
CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */ CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */
0, /* flags */ EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT,
chacha_init_key, chacha_init_key,
chacha_cipher, chacha_cipher,
NULL, NULL,