diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
| commit | 5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch) | |
| tree | bc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/apps/enc.c | |
| parent | 576b0c26baf9b5b1418650a572604325ca7fb3af (diff) | |
| parent | f347c871d0433ef3efb85beb5e386b58d700faad (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/openssl/apps/enc.c')
| -rw-r--r-- | app/openssl/apps/enc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/openssl/apps/enc.c b/app/openssl/apps/enc.c index 19ea3df9..c8cb0212 100644 --- a/app/openssl/apps/enc.c +++ b/app/openssl/apps/enc.c @@ -67,7 +67,9 @@ #include <openssl/x509.h> #include <openssl/rand.h> #include <openssl/pem.h> +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> +#endif #include <ctype.h> int set_hex(char *in,unsigned char *out,int size); @@ -337,6 +339,12 @@ bad: 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); |