diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-30 00:59:56 +0900 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-01-24 15:22:35 +0100 |
| commit | 0de0fb887b464a9f0f20ddcf98e7980ae4b0fd9c (patch) | |
| tree | 0288d42d5f65866f0ed3567b855bae4a70ab356e /crypto/evp | |
| parent | cee0cdbc618d89f6e9eb14c360be8230b8397095 (diff) | |
Add missing flags for EVP_chacha20()
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)
(cherry picked from commit c83680a04aac7a15e6ac48ed732b8322c4c9d49a)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_chacha20_poly1305.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 952bd3fca7..befd805e35 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -127,7 +127,7 @@ static const EVP_CIPHER chacha20 = { 1, /* block_size */ CHACHA_KEY_SIZE, /* key_len */ 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_cipher, NULL, |