VMS: Compensate for x86_64 cross compiler type incompatibility
authorRichard Levitte <levitte@openssl.org>
Thu, 2 Sep 2021 11:10:33 +0000 (13:10 +0200)
committerRichard Levitte <levitte@openssl.org>
Fri, 3 Sep 2021 09:22:33 +0000 (11:22 +0200)
The x86_64 cross compiler says that 'unsigned long long' isn't the
same as 'unsigned __int64'.  Sure, and considering that
providers/implementations/rands/seeding/rand_vms.c is specific VMS
only code, it's easy to just change the type to the exact same as
what's specified in the system headers.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16497)

(cherry picked from commit 1ef526ef421febe50a105bb140d7e3a70bd76b61)

providers/implementations/rands/seeding/rand_vms.c

index 8f8855321b2fb04b681a7bd1004b8f8d8f1f78e4..abc06ffd5bb183c65299c79b5c179826ae20b3a2 100644 (file)
@@ -479,7 +479,7 @@ int ossl_pool_add_nonce_data(RAND_POOL *pool)
     struct {
         pid_t pid;
         CRYPTO_THREAD_ID tid;
-        uint64_t time;
+        unsigned __int64 time;
     } data;
 
     /* Erase the entire structure including any padding */
@@ -580,7 +580,7 @@ int ossl_rand_pool_add_additional_data(RAND_POOL *pool)
 {
     struct {
         CRYPTO_THREAD_ID tid;
-        uint64_t time;
+        unsigned __int64 time;
     } data;
 
     /* Erase the entire structure including any padding */