Merge from 0.9.6-stable branch. No conflicts.

2001-07-05 13:56:50 +00:00
parent 4ae5099856
commit 393a9b68cf
13 changed files with 371 additions and 206 deletions
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -542,6 +542,14 @@ bad:
 			BIO_printf(bio_err,"invalid hex iv value\n");
 			goto end;
 			}
+		if ((hiv == NULL) && (str == NULL))
+			{
+			/* No IV was explicitly set and no IV was generated
+			 * during EVP_BytesToKey. Hence the IV is undefined,
+			 * making correct decryption impossible. */
+			BIO_printf(bio_err, "iv undefined\n");
+			goto end;
+			}
 		if ((hkey != NULL) && !set_hex(hkey,key,24))
 			{
 			BIO_printf(bio_err,"invalid hex key value\n");