Commit c4aede20 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
parent d1247df2

crypto/evp/e_aes.c

+6 −3
Original line number Diff line number Diff line
@@ -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