[openssl] openssl-3.0 update
Richard Levitte
levitte at openssl.org
Fri Sep 3 09:21:10 UTC 2021
The branch openssl-3.0 has been updated
via 1ef526ef421febe50a105bb140d7e3a70bd76b61 (commit)
from 37ceb9b17561554256fb60eb73e9dec418132b29 (commit)
- Log -----------------------------------------------------------------
commit 1ef526ef421febe50a105bb140d7e3a70bd76b61
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Sep 2 13:10:33 2021 +0200
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 <tomas at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16497)
-----------------------------------------------------------------------
Summary of changes:
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 8f8855321b..abc06ffd5b 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 */
More information about the openssl-commits
mailing list