[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
Rich Salz
rsalz at openssl.org
Sun Nov 13 03:23:14 UTC 2016
The branch OpenSSL_1_0_2-stable has been updated
via 3201a1d68121cb074c4b7e7712be77acb17df632 (commit)
from 19e1de548eff0b08ba2878b3258aaceead32977b (commit)
- Log -----------------------------------------------------------------
commit 3201a1d68121cb074c4b7e7712be77acb17df632
Author: Matthias Kraft <Matthias.Kraft at softwareag.com>
Date: Fri Sep 30 10:50:17 2016 +0200
Solution proposal for issue #1647.
Avoid a memory alignment issue.
Signed-off-by: Matthias Kraft <Matthias.Kraft at softwareag.com>
CLA: trivial
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1650)
-----------------------------------------------------------------------
Summary of changes:
ssl/bad_dtls_test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ssl/bad_dtls_test.c b/ssl/bad_dtls_test.c
index d42817f..70d8578 100644
--- a/ssl/bad_dtls_test.c
+++ b/ssl/bad_dtls_test.c
@@ -756,6 +756,7 @@ int main(int argc, char *argv[])
BIO *rbio;
BIO *wbio;
BIO *err;
+ time_t now = 0;
int testresult = 0;
int ret;
int i;
@@ -773,7 +774,9 @@ int main(int argc, char *argv[])
RAND_bytes(master_secret, sizeof(master_secret));
RAND_bytes(cookie, sizeof(cookie));
RAND_bytes(server_random + 4, sizeof(server_random) - 4);
- time((void *)server_random);
+
+ now = time(NULL);
+ memcpy(server_random, &now, sizeof(now));
sess = client_session();
if (sess == NULL) {
More information about the openssl-commits
mailing list