Commit 2841d6ca authored by Miod Vallat's avatar Miod Vallat Committed by Matt Caswell
Browse files

Fix off-by-one errors in ssl_cipher_get_evp() 

In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.

Bug discovered and fixed by Miod Vallat from the OpenBSD team.

PR#3375
parent cf1b08cd

ssl/ssl_ciph.c

+2 −2
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 
		break;

		}



	if ((i < 0) || (i > SSL_ENC_NUM_IDX))

	if ((i < 0) || (i >= SSL_ENC_NUM_IDX))

		*enc=NULL;

	else

		{
@@ -616,7 +616,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 
		i= -1;

		break;

		}

	if ((i < 0) || (i > SSL_MD_NUM_IDX))

	if ((i < 0) || (i >= SSL_MD_NUM_IDX))

	{

		*md=NULL; 

		if (mac_pkey_type!=NULL) *mac_pkey_type = NID_undef;