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:21:28 +0100 |
| commit | c83680a04aac7a15e6ac48ed732b8322c4c9d49a (patch) | |
| tree | a5b82d075dcf9f151e11adc7adee7f84ef2221ce | |
| parent | 38088ce9934a90d4aea486edbff864f3935342e6 (diff) | |
| download | openssl-c83680a04aac7a15e6ac48ed732b8322c4c9d49a.tar.gz | |
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)
| -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, |