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

This reverts commit 29411a0c7a00a73e4ca42be8b5a7401d3bb5107a.

Incorrect attribution.

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 58f58e0ee96a084b413d521c441ce3abf21b99e8..06da26acc5875097ca8e945f73e035ebf4af7897 100644 (file)
--- 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;
                }
 
                break;
                }
 

-       if ((i < 0) || (i >= SSL_ENC_NUM_IDX))
+       if ((i < 0) || (i > SSL_ENC_NUM_IDX))

                *enc=NULL;
        else
                {
                *enc=NULL;
        else
                {


@@ -597,7 +597,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                i= -1;
                break;
                }
                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;
        {
                *md=NULL; 
                if (mac_pkey_type!=NULL) *mac_pkey_type = NID_undef;