summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2014-06-22 23:24:52 +0100
committerMatt Caswell <matt@openssl.org>2014-06-22 23:24:52 +0100
commitcdc596567d61fb844a6e87b58c64aaf9fa0a4a2b (patch)
tree957e10988624e94e120a3dde4a9600ebe71617f3
parent70d923fb0359ed68e59b8c59d1687ebff6f8d952 (diff)
Revert " Fix off-by-one errors in ssl_cipher_get_evp()"
This reverts commit def1490717c091c6ef669da9fc5ea4c8b2a4d776. Incorrect attribution
-rw-r--r--ssl/ssl_ciph.c4
1 files changed, 2 insertions, 2 deletions
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];