[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c83680a04aac7a15e6ac48ed732b8322c4c9d49a (commit)
      from  38088ce9934a90d4aea486edbff864f3935342e6 (commit)


- Log -----------------------------------------------------------------
commit c83680a04aac7a15e6ac48ed732b8322c4c9d49a
Author: Kazuki Yamaguchi <k at rhe.jp>
Date:   Fri Dec 30 00:59:56 2016 +0900

    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 at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2156)

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/e_chacha20_poly1305.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 952bd3f..befd805 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,