[openssl] OpenSSL_1_1_1-stable update
tmraz at fedoraproject.org
tmraz at fedoraproject.org
Fri Apr 17 11:22:00 UTC 2020
The branch OpenSSL_1_1_1-stable has been updated
via 8e0539bbb00cc4c98be440eb353689ff6f61028f (commit)
from 5f62ff49a9fdc9079aa6e9aefaf2cee51d2f4455 (commit)
- Log -----------------------------------------------------------------
commit 8e0539bbb00cc4c98be440eb353689ff6f61028f
Author: Kochise <david.koch at 9online.fr>
Date: Mon Mar 16 20:04:04 2020 +0100
Windows: Add type casting in CRYPTO_atomic_add to remove warning
CLA: trivial
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11337)
(cherry picked from commit 7da7b27eec58d1efc7012f002c45ddbdd61a5e79)
-----------------------------------------------------------------------
Summary of changes:
crypto/threads_win.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index ba25d2719a..0e6d77103b 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -155,7 +155,7 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
- *ret = InterlockedExchangeAdd(val, amount) + amount;
+ *ret = (int)InterlockedExchangeAdd((long volatile *)val, (long)amount) + amount;
return 1;
}
More information about the openssl-commits
mailing list