diff options
| author |   beck <beck@openbsd.org> | 2001-08-01 19:51:16 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2001-08-01 19:51:16 +0000 |
| commit | 200c029058c06b55c32b17d710757f7a3cca1ab1 (patch) | |
| tree | 3c061a100d7c302e1a7124b24e4d7cbe0e3c4bb3 /lib/libssl/src/crypto/cryptlib.c | |
| parent | http://www.openssl.org/news/secadv_prng.txt; ok beck@ (diff) | |
| download | wireguard-openbsd-200c029058c06b55c32b17d710757f7a3cca1ab1.tar.xz wireguard-openbsd-200c029058c06b55c32b17d710757f7a3cca1ab1.zip | |
merge openssl 0.9.6b-engine
Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries
Diffstat (limited to 'lib/libssl/src/crypto/cryptlib.c')
| -rw-r--r-- | lib/libssl/src/crypto/cryptlib.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index 9de60fd5281..a7a9262133e 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -241,7 +241,7 @@ void CRYPTO_destroy_dynlockid(int i) } else #endif - if (--(pointer->references) <= 0) + if (pointer->references <= 0) { sk_CRYPTO_dynlock_set(dyn_locks, i, NULL); } @@ -396,16 +396,15 @@ void CRYPTO_lock(int mode, int type, const char *file, int line) #endif if (type < 0) { - int i = -type - 1; struct CRYPTO_dynlock_value *pointer - = CRYPTO_get_dynlock_value(i); + = CRYPTO_get_dynlock_value(type); - if (pointer) + if (pointer && dynlock_lock_callback) { dynlock_lock_callback(mode, pointer, file, line); } - CRYPTO_destroy_dynlockid(i); + CRYPTO_destroy_dynlockid(type); } else if (locking_callback != NULL) @@ -431,7 +430,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, CRYPTO_get_lock_name(type), file,line); #endif - *pointer=ret; } else { |