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

(in main branch, hn_ncipher.c is already correct)
openssl · Nov 23, 2001 · 883b0c2 · 883b0c2
1 parent 4f94d1a
commit 883b0c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -12,6 +12,14 @@
          *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
          +) applies to 0.9.7 only
 
+  *) 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 and 0.9.7 release:]
+     Fix mutex callback return values in crypto/engine/hw_ncipher.c.
+     [Andy Schneider <andy.schneider@bjss.co.uk>]
+
   *) Add a configuration entry for OS/390 Unix.  The C compiler 'c89'
      is called via tools/c89.sh because arguments have to be
      rearranged (all '-L' options must appear before the first object

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
@@ -230,7 +230,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)
 		{

diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
@@ -1204,8 +1204,8 @@ static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt,
 	{
 	mt->lockid = CRYPTO_get_new_dynlockid();
 	if (mt->lockid == 0)
-		return -1;
-	return 0;
+		return 1; /* failure */
+	return 0; /* success */
 	}
 
 static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt)