[openssl-commits] [openssl] OpenSSL_1_0_1-stable update
Rich Salz
rsalz at openssl.org
Sun Nov 27 01:09:22 UTC 2016
The branch OpenSSL_1_0_1-stable has been updated
via 4675a56a3ce2bef715386e45036426c8a4329d39 (commit)
from edfca4e3daab653ec6db79ef1b01762db7ba1a52 (commit)
- Log -----------------------------------------------------------------
commit 4675a56a3ce2bef715386e45036426c8a4329d39
Author: Vitezslav Cizek <vcizek at suse.com>
Date: Thu Nov 24 13:21:41 2016 +0100
apps/speed.c: Fix crash when config loading fails
Move rsa_key initialization in front of load_config().
If loading the config fails, rsa_key isn't initialized and may
cause invalid free() in the end: cleanup.
Remove superfluous memset.
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(cherry picked from commit c003851783ed05e3fd5296786e1f8f6a63dc4f31)
-----------------------------------------------------------------------
Summary of changes:
apps/speed.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/apps/speed.c b/apps/speed.c
index ef72723..7922473 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -666,6 +666,10 @@ int MAIN(int argc, char **argv)
ecdh_b[i] = NULL;
}
# endif
+# ifndef OPENSSL_NO_RSA
+ for (i = 0; i < RSA_NUM; i++)
+ rsa_key[i] = NULL;
+# endif
if (bio_err == NULL)
if ((bio_err = BIO_new(BIO_s_file())) != NULL)
@@ -674,12 +678,6 @@ int MAIN(int argc, char **argv)
if (!load_config(bio_err, NULL))
goto end;
-# ifndef OPENSSL_NO_RSA
- memset(rsa_key, 0, sizeof(rsa_key));
- for (i = 0; i < RSA_NUM; i++)
- rsa_key[i] = NULL;
-# endif
-
if ((buf = (unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) {
BIO_printf(bio_err, "out of memory\n");
goto end;
More information about the openssl-commits
mailing list