projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DH_check_pub_key_ex was accidentally calling DH_check,
[openssl.git]
/
crypto
/
threads_none.c
diff --git
a/crypto/threads_none.c
b/crypto/threads_none.c
index 30ed4e6999cc6c1fbae8fa35d682468e7ab5513f..ff95556c17d62356ffbec20bf84340256b431d65 100644
(file)
--- a/
crypto/threads_none.c
+++ b/
crypto/threads_none.c
@@
-1,7
+1,7
@@
/*
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016
-2018
The OpenSSL Project Authors. All Rights Reserved.
*
*
- * Licensed under the
OpenSSL license
(the "License"). You may not use
+ * Licensed under the
Apache License 2.0
(the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
@@
-14,9
+14,12
@@
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
- CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(unsigned int));
- if (lock == NULL)
+ CRYPTO_RWLOCK *lock;
+
+ if ((lock = OPENSSL_zalloc(sizeof(unsigned int))) == NULL) {
+ /* Don't set error, to avoid recursion blowup. */
return NULL;
return NULL;
+ }
*(unsigned int *)lock = 1;
*(unsigned int *)lock = 1;
@@
-125,18
+128,6
@@
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
return 1;
}
return 1;
}
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
- *ret = *val;
- return 1;
-}
-
-int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
-{
- *val = n;
- return 1;
-}
-
int openssl_init_fork_handlers(void)
{
return 0;
int openssl_init_fork_handlers(void)
{
return 0;