[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  af5883fec95eb8c79c379b09885440a0d88b2d38 (commit)
      from  a22f9c84b468eed83c651cb5f2c68c7ad4103ffd (commit)


- Log -----------------------------------------------------------------
commit af5883fec95eb8c79c379b09885440a0d88b2d38
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:
 test/bad_dtls_test.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 4ee155f..1408a13 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -451,6 +451,7 @@ int main(int argc, char *argv[])
     BIO *rbio;
     BIO *wbio;
     BIO *err;
+    time_t now = 0;
     int testresult = 0;
     int ret;
     int i;
@@ -464,7 +465,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) {