Raise an error on syscall failure in tls_retry_write_records

[thirdparty/openssl.git] / crypto / info.c

diff --git a/crypto/info.c b/crypto/info.c
index f3bef56b1369f063d153152b4097333b3995306c..9ef9ee4704705519df29a84a401936ce2ad6e4dd 100644 (file)
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,7 +12,7 @@
 #include "crypto/dso_conf.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
-#include "e_os.h"
+#include "internal/e_os.h"
 #include "buildinf.h"
 
 #if defined(__arm__) || defined(__arm) || defined(__aarch64__)
@@ -45,10 +45,10 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings)
 
     BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
                  CPUINFO_PREFIX "OPENSSL_ia32cap=0x%llx:0x%llx",
-                 (long long)OPENSSL_ia32cap_P[0] |
-                 (long long)OPENSSL_ia32cap_P[1] << 32,
-                 (long long)OPENSSL_ia32cap_P[2] |
-                 (long long)OPENSSL_ia32cap_P[3] << 32);
+                 (unsigned long long)OPENSSL_ia32cap_P[0] |
+                 (unsigned long long)OPENSSL_ia32cap_P[1] << 32,
+                 (unsigned long long)OPENSSL_ia32cap_P[2] |
+                 (unsigned long long)OPENSSL_ia32cap_P[3] << 32);
     if ((env = getenv("OPENSSL_ia32cap")) != NULL)
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
                      sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
@@ -131,8 +131,8 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings)
 #ifdef OPENSSL_RAND_SEED_NONE
         add_seeds_string("none");
 #endif
-#ifdef OPENSSL_RAND_SEED_RTDSC
-        add_seeds_string("stdsc");
+#ifdef OPENSSL_RAND_SEED_RDTSC
+        add_seeds_string("rdtsc");
 #endif
 #ifdef OPENSSL_RAND_SEED_RDCPU
 # ifdef __aarch64__