diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 09:01:38 -0400 |
| commit | f65ff03d106f4cfe162bfde4780426b7bbc2e4ee (patch) | |
| tree | 571dd0bd95a0341fcb1817a3a17df69b1d43e3de /openssl/apps/enc.c | |
| parent | 4241d28e545a02eb753c8f713149e20747f044b6 (diff) | |
| download | vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.gz vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.bz2 vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.zip | |
Update openssl: 1.0.1m -> 1.0.1o
Diffstat (limited to 'openssl/apps/enc.c')
| -rw-r--r-- | openssl/apps/enc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/openssl/apps/enc.c b/openssl/apps/enc.c index 5c2cf7a4a..7b7c70b13 100644 --- a/openssl/apps/enc.c +++ b/openssl/apps/enc.c @@ -548,9 +548,14 @@ int MAIN(int argc, char **argv) else OPENSSL_cleanse(str, strlen(str)); } - if ((hiv != NULL) && !set_hex(hiv, iv, sizeof iv)) { - BIO_printf(bio_err, "invalid hex iv value\n"); - goto end; + if (hiv != NULL) { + int siz = EVP_CIPHER_iv_length(cipher); + if (siz == 0) { + BIO_printf(bio_err, "warning: iv not use by this cipher\n"); + } else if (!set_hex(hiv, iv, sizeof iv)) { + BIO_printf(bio_err, "invalid hex iv value\n"); + goto end; + } } if ((hiv == NULL) && (str == NULL) && EVP_CIPHER_iv_length(cipher) != 0) { @@ -562,7 +567,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "iv undefined\n"); goto end; } - if ((hkey != NULL) && !set_hex(hkey, key, sizeof key)) { + if ((hkey != NULL) && !set_hex(hkey, key, EVP_CIPHER_key_length(cipher))) { BIO_printf(bio_err, "invalid hex key value\n"); goto end; } |