Commit a01461da 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 9576c150

crypto/cryptlib.c

+7 −8
Original line number Diff line number Diff line
@@ -409,18 +409,17 @@ void CRYPTO_lock(int mode, int type, const char *file, int line) 
#endif

	if (type < 0)

		{

		int i = -type - 1;

		if (dynlock_lock_callback != NULL)

			{

			struct CRYPTO_dynlock_value *pointer

			= CRYPTO_get_dynlock_value(i);

				= CRYPTO_get_dynlock_value(type);



			assert(pointer != NULL);



		if (dynlock_lock_callback)

			{

			dynlock_lock_callback(mode, pointer, file, line);

			}



		CRYPTO_destroy_dynlockid(i);

			CRYPTO_destroy_dynlockid(type);

			}

		}

	else

		if (locking_callback != NULL)