Commit 1b822dec authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't set *pointer if add_lock_callback used.

parent dab4c282

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 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

     ssl3_enc (ssl/s3_enc.c) and tls1_enc (ssl/t1_enc.c).

     [Bodo Moeller]

crypto/cryptlib.c

+0 −1
Original line number Diff line number Diff line
@@ -430,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

		{