[openssl] OpenSSL_1_0_2-stable update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Mon Sep 16 16:16:48 UTC 2019


The branch OpenSSL_1_0_2-stable has been updated
       via  1c10029a68e910d936f9bf011f8c3bb18a05ff8b (commit)
      from  fc437d8dd388753ffb7cc0fd4413c449747616fa (commit)


- Log -----------------------------------------------------------------
commit 1c10029a68e910d936f9bf011f8c3bb18a05ff8b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Sep 13 06:37:50 2019 +0200

    Fix no-asm build in windows
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9885)

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

Summary of changes:
 crypto/cryptlib.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 5fab45b2ec..8a793cad9b 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -745,6 +745,11 @@ int OPENSSL_NONPIC_relocated = 0;
 void OPENSSL_cpuid_setup(void)
 {
 }
+
+unsigned long OPENSSL_rdtsc(void)
+{
+    return 0;
+}
 #endif
 
 #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL)


More information about the openssl-commits mailing list