Commit b9b6e14b authored by Richard Levitte's avatar Richard Levitte
Browse files

In CRYPTO_lock(), check that the application cares about locking (provided 

callbacks) before attempting to lock.
parent 442d4230

crypto/cryptlib.c

+7 −7
Original line number Diff line number Diff line
@@ -471,19 +471,19 @@ void CRYPTO_lock(int mode, int type, const char *file, int line) 
		}

#endif

	if (type < 0)

		{

		if (dynlock_lock_callback != NULL)

			{

			struct CRYPTO_dynlock_value *pointer

				= CRYPTO_get_dynlock_value(type);



			OPENSSL_assert(pointer != NULL);



		if (dynlock_lock_callback)

			{

			dynlock_lock_callback(mode, pointer, file, line);

			}



			CRYPTO_destroy_dynlockid(type);

			}

		}

	else

		if (locking_callback != NULL)

			locking_callback(mode,type,file,line);