[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c4aede204e1f643f8be45f9aebc9daeb8cb378e9 (commit)
      from  d1247df266130561c9f1ab46a905ab04888ef6d9 (commit)


- Log -----------------------------------------------------------------
commit c4aede204e1f643f8be45f9aebc9daeb8cb378e9
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 15 12:05:16 2016 +0000

    Mark OCB as an AEAD cipher
    
    OCB is AEAD capable but was not marked as such with the
    EVP_CIPH_FLAG_AEAD_CIPHER flag.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/evp/e_aes.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 6191680..360f572 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -2684,8 +2684,11 @@ static int aes_ocb_cleanup(EVP_CIPHER_CTX *c)
     return 1;
 }
 
-BLOCK_CIPHER_custom(NID_aes, 128, 16, 12, ocb, OCB, CUSTOM_FLAGS)
-    BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB, CUSTOM_FLAGS)
-    BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB, CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes, 128, 16, 12, ocb, OCB,
+                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
+                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
+                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
 # endif                         /* OPENSSL_NO_OCB */
 #endif