From: Andy Polyakov <appro@openssl.org>
Date: Wed, 9 Dec 2015 20:35:30 +0000 (+0100)
Subject: test/evp_test.c: allow generic AEAD ciphers to be tested.
X-Git-Tag: OpenSSL_1_1_0-pre1~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb85cb8632ad5d868a5634b3ce18846ae351c380;p=oweals%2Fopenssl.git

test/evp_test.c: allow generic AEAD ciphers to be tested.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/test/evp_test.c b/test/evp_test.c
index 725af8a53a..ec2283a50f 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -774,6 +774,8 @@ static int cipher_test_init(struct evp_test *t, const char *alg)
         || EVP_CIPHER_mode(cipher) == EVP_CIPH_OCB_MODE
         || EVP_CIPHER_mode(cipher) == EVP_CIPH_CCM_MODE)
         cdat->aead = EVP_CIPHER_mode(cipher);
+    else if (EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
+        cdat->aead = -1;
     else
         cdat->aead = 0;