From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 15 May 2014 13:05:47 +0000 (+0100)
Subject: Enc doesn't support AEAD ciphers.
X-Git-Tag: master-post-reformat~807
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3586512184b4ca6c682c479323ac282ab30298e;p=oweals%2Fopenssl.git

Enc doesn't support AEAD ciphers.
(cherry picked from commit 09184dddead165901700b31eb39d540ba30f93c5)
---

diff --git a/apps/enc.c b/apps/enc.c
index aef8978a9a..d84c51dbcc 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -331,6 +331,12 @@ bad:
         setup_engine(bio_err, engine, 0);
 #endif
 
+	if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
+		{
+		BIO_printf(bio_err, "AEAD ciphers not supported by the enc utility\n");
+		goto end;
+		}
+
 	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
 		{
 		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);