generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes submitted by Andy Schneider <andy.schneider@bjss.co.uk>

Browse Source
This commit is contained in:
Bodo Möller 2001-11-23 20:56:27 +00:00
parent f1a185a04a
commit dae0b520a0
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -4,6 +4,14 @@
Changes between 0.9.6b and 0.9.6c [XX xxx XXXX]
*) Release CRYPTO_LOCK_DYNLOCK when CRYPTO_destroy_dynlockid()
returns early because it has nothing to do.
[Andy Schneider <andy.schneider@bjss.co.uk>]
*) [In 0.9.6c-engine release:]
Fix mutex callback return values in crypto/engine/hw_ncipher.c.
[Andy Schneider <andy.schneider@bjss.co.uk>]
*) [In 0.9.6c-engine release:]
Add support for Cryptographic Appliance's keyserver technology.
(Use engine 'keyclient')

5
crypto/cryptlib.c
View File

@ -229,7 +229,10 @@ void CRYPTO_destroy_dynlockid(int i)
CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
if (dyn_locks == NULL || i >= sk_CRYPTO_dynlock_num(dyn_locks))
return;
{
CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
return;
}
pointer = sk_CRYPTO_dynlock_value(dyn_locks, i);
if (pointer != NULL)
{

6
crypto/engine/hw_ncipher.c
View File

@ -939,14 +939,14 @@ static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt,
{
mt->lockid = CRYPTO_get_new_dynlockid();
if (mt->lockid == 0)
return 0;
return 1;
return 1; /* failure */
return 0; /* success */
}
static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt)
{
CRYPTO_w_lock(mt->lockid);
return 1;
return 0;
}
void hwcrhk_mutex_unlock(HWCryptoHook_Mutex * mt)