Don't set *pointer if add_lock_callback used.

This commit is contained in:
Dr. Stephen Henson
2001-06-19 00:09:20 +00:00
parent dab4c2824f
commit 1b822decb8
2 changed files with 5 additions and 1 deletions

View File

@@ -4,6 +4,11 @@
Changes between 0.9.6a and 0.9.6b [XX xxx XXXX] Changes between 0.9.6a and 0.9.6b [XX xxx XXXX]
*) Don't change *pointer in CRYPTO_add_lock() is add_lock_callback is
used: it isn't thread safe and the add_lock_callback should handle
that itself.
[Paul Rose <Paul.Rose@bridge.com>]
*) Verify that incoming data obeys the block size in *) Verify that incoming data obeys the block size in
ssl3_enc (ssl/s3_enc.c) and tls1_enc (ssl/t1_enc.c). ssl3_enc (ssl/s3_enc.c) and tls1_enc (ssl/t1_enc.c).
[Bodo Moeller] [Bodo Moeller]

View File

@@ -430,7 +430,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
CRYPTO_get_lock_name(type), CRYPTO_get_lock_name(type),
file,line); file,line);
#endif #endif
*pointer=ret;
} }
else else
{ {