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

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

This reverts commit 7e98378d155263bebbea3b3c13c1b6a780c8a6d3.

Incorrect attribution.
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 704854be91..54ba7ef5b4 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -531,7 +531,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
 		{
@@ -559,7 +559,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;