From: Miod Vallat <miod@openbsd.org>
Date: Wed, 4 Jun 2014 07:59:58 +0000 (-0400)
Subject: Fix off-by-one errors in ssl_cipher_get_evp()
X-Git-Tag: master-post-reformat~681
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2841d6ca9f87c2aeb318e6957038864119770e3a;p=oweals%2Fopenssl.git

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
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 0f03b063e8..ad9b762101 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -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;