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

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

This reverts commit def1490717c091c6ef669da9fc5ea4c8b2a4d776.

Incorrect attribution
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index c16ba15188..a54c06ffb7 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -390,7 +390,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
 		{
@@ -412,7 +412,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;
 	else
 		*md=ssl_digest_methods[i];