Commit dae0b520 authored by Bodo Möller's avatar Bodo Möller
Browse files

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

parent f1a185a0

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -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')

crypto/cryptlib.c

+4 −1
Original line number Diff line number Diff line
@@ -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))

		{

		CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);

 		return;

		}

	pointer = sk_CRYPTO_dynlock_value(dyn_locks, i);

	if (pointer != NULL)

		{

crypto/engine/hw_ncipher.c

+3 −3
Original line number Diff line number Diff line
@@ -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)