summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2018-06-28 18:13:54 -0400
committerRich Salz <rsalz@openssl.org>2018-06-28 18:13:54 -0400
commit10c3c1c1ec41ce16e51b92bb18fab92d1a42b49c (patch)
tree9da48e9ada54802de1c77f4c1a735ac5660796f5
parent358ffa05cd3a088822c7d06256bc87516d918798 (diff)
Zero-fill IV by default.
Fixes uninitialized memory read reported by Nick Mathewson Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6603)
-rw-r--r--crypto/pem/pem_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 7c82561ba4..5c21a86846 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -488,6 +488,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
char *dekinfostart, c;
cipher->cipher = NULL;
+ memset(cipher->iv, 0, sizeof(cipher->iv));
if ((header == NULL) || (*header == '\0') || (*header == '\n'))
return 1;