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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 9de60fd528..a7a9262133 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/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
                 {