From: Matt Caswell Date: Tue, 15 Mar 2016 12:05:16 +0000 (+0000) Subject: Mark OCB as an AEAD cipher X-Git-Tag: OpenSSL_1_1_0-pre5~328 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4aede204e1f643f8be45f9aebc9daeb8cb378e9;p=oweals%2Fopenssl.git 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 --- diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 6191680097..360f572731 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