From 9150ca6017f8654e671bd7d7d1b494ce1ce3fa0d Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 2 Sep 2021 13:10:33 +0200 Subject: [PATCH] VMS: Compensate for x86_64 cross compiler type incompatibility 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 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/16497) (cherry picked from commit 1ef526ef421febe50a105bb140d7e3a70bd76b61) --- providers/implementations/rands/seeding/rand_vms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c index 8f8855321b2..abc06ffd5bb 100644 --- a/providers/implementations/rands/seeding/rand_vms.c +++ b/providers/implementations/rands/seeding/rand_vms.c @@ -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 */ -- 2.47.2