diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-08-07 13:36:56 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-08-07 13:36:56 +0400 |
| commit | aa3b4b4d106415b3afbc31df0db2476a04c997f1 (patch) | |
| tree | 338357f4c5326c2d65dfca459995e3989f994ca9 /deps/openssl/openssl/apps/enc.c | |
| parent | 63a42682187a963873211da8f647fa3c077489f4 (diff) | |
| download | android-node-v8-aa3b4b4d106415b3afbc31df0db2476a04c997f1.tar.gz android-node-v8-aa3b4b4d106415b3afbc31df0db2476a04c997f1.tar.bz2 android-node-v8-aa3b4b4d106415b3afbc31df0db2476a04c997f1.zip | |
deps: update openssl to v1.0.1i
Diffstat (limited to 'deps/openssl/openssl/apps/enc.c')
| -rw-r--r-- | deps/openssl/openssl/apps/enc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/deps/openssl/openssl/apps/enc.c b/deps/openssl/openssl/apps/enc.c index 19ea3df940..c8cb021224 100644 --- a/deps/openssl/openssl/apps/enc.c +++ b/deps/openssl/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); |