Commit 3cc1f498 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't set pointer if add_lock_callback used.

parent c6c0035e

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
         *) applies to 0.9.6a (/0.9.6b) and 0.9.7

         +) applies to 0.9.7 only



  *) 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
@@ -431,7 +431,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

		{