[openssl] master update

matthias.st.pierre at ncp-e.com matthias.st.pierre at ncp-e.com
Fri Mar 15 07:46:01 UTC 2019


The branch master has been updated
       via  355417eb4611014767480e5d3e96b1b08eb02700 (commit)
      from  503d4745a115b82db01c1fb22baaddb153d27cdb (commit)


- Log -----------------------------------------------------------------
commit 355417eb4611014767480e5d3e96b1b08eb02700
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Fri Mar 15 01:48:51 2019 +0100

    VMS: only use the high precision on VMS v8.4 and up
    
    Fixes #8487
    Amends #7230
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8488)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_vms.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index c083977..d35106a 100644
--- a/crypto/rand/rand_vms.c
+++ b/crypto/rand/rand_vms.c
@@ -507,7 +507,11 @@ int rand_pool_add_additional_data(RAND_POOL *pool)
      * concurrently (which is the case for the <master> drbg).
      */
     data.tid = CRYPTO_THREAD_get_current_id();
+#if __CRTL_VER >= 80400000
     sys$gettim_prec(&data.time);
+#else
+    sys$gettim((void*)&data.time);
+#endif
 
     return rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0);
 }


More information about the openssl-commits mailing list