]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
VMS: Compensate for compiler type incompatibility
authorRichard Levitte <levitte@openssl.org>
Mon, 6 Sep 2021 11:40:43 +0000 (13:40 +0200)
committerRichard Levitte <levitte@openssl.org>
Tue, 7 Sep 2021 21:32:37 +0000 (23:32 +0200)
The compiler says that 'unsigned long long' isn't the same as
'unsigned __int64'.  Sure, and considering that crypto/rand/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/15613)

crypto/rand/rand_vms.c

index 61c2f102997c1150cbc69eef3e43dff5e81fa196..fe516c3ca56b5d1b4a297a7318481f4a6d3110d9 100644 (file)
@@ -484,7 +484,7 @@ int rand_pool_add_nonce_data(RAND_POOL *pool)
     struct {
         pid_t pid;
         CRYPTO_THREAD_ID tid;
-        uint64_t time;
+        unsigned __int64_t time;
     } data = { 0 };
 
     /*
@@ -582,7 +582,7 @@ int rand_pool_add_additional_data(RAND_POOL *pool)
 {
     struct {
         CRYPTO_THREAD_ID tid;
-        uint64_t time;
+        unsigned __int64_t time;
     } data = { 0 };
 
     /*