Revert " Fix off-by-one errors in ssl_cipher_get_evp()"
authorMatt Caswell <matt@openssl.org>
Sun, 22 Jun 2014 22:24:52 +0000 (23:24 +0100)
committerMatt Caswell <matt@openssl.org>
Sun, 22 Jun 2014 22:24:52 +0000 (23:24 +0100)
This reverts commit def1490717c091c6ef669da9fc5ea4c8b2a4d776.

Incorrect attribution

ssl/ssl_ciph.c

index c16ba1518894bfd000550dae8f729752eba09486..a54c06ffb7d3e92e12c4382cbc3eb572e1da5155 100644 (file)
@@ -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];