From: Matt Caswell <matt@openssl.org>
Date: Sun, 22 Jun 2014 22:20:19 +0000 (+0100)
Subject: Revert "Fix off-by-one errors in ssl_cipher_get_evp()"
X-Git-Tag: OpenSSL_1_0_1i~88
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1bce59fd3c712ec99308f79dfcf8bece6ce28cb;p=oweals%2Fopenssl.git

Revert "Fix off-by-one errors in ssl_cipher_get_evp()"

This reverts commit 29411a0c7a00a73e4ca42be8b5a7401d3bb5107a.

Incorrect attribution.
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 58f58e0ee9..06da26acc5 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -563,7 +563,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
 		{
@@ -597,7 +597,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;