From 0099f6f89a1325dc504096aecbdcbddad498310e Mon Sep 17 00:00:00 2001 From: Xin LI Date: Wed, 25 Feb 2015 05:56:16 +0000 Subject: Fix integer overflow in IGMP protocol. [SA-15:04] Fix vt(4) crash with improper ioctl parameters. [EN-15:01] Updated base system OpenSSL to 1.0.1l. [EN-15:02] Fix freebsd-update libraries update ordering issue. [EN-15:03] Approved by: so --- crypto/openssl/apps/enc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'crypto/openssl/apps/enc.c') diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c index 719acc325053..c8cb021224e6 100644 --- a/crypto/openssl/apps/enc.c +++ b/crypto/openssl/apps/enc.c @@ -67,7 +67,9 @@ #include #include #include +#ifndef OPENSSL_NO_COMP #include +#endif #include int set_hex(char *in,unsigned char *out,int size); @@ -331,6 +333,18 @@ 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 (cipher && (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE)) + { + BIO_printf(bio_err, "Ciphers in XTS mode are 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); -- cgit v1.2.3