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

Incorrect attribution.

ssl/ssl_ciph.c

index 704854be911341288e1041650e43612bc0e83cee..54ba7ef5b4acfe1c42afe53630aef7e446d34d73 100644 (file)
@@ -531,7 +531,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
                {
@@ -559,7 +559,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;