From e1bce59fd3c712ec99308f79dfcf8bece6ce28cb Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Sun, 22 Jun 2014 23:20:19 +0100 Subject: [PATCH] Revert "Fix off-by-one errors in ssl_cipher_get_evp()" This reverts commit 29411a0c7a00a73e4ca42be8b5a7401d3bb5107a. Incorrect attribution. --- ssl/ssl_ciph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.25.1