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

Incorrect attribution

ssl/ssl_ciph.c

index ad9b762..0f03b06 100644 (file)
@@ -582,7 +582,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
                {
@@ -616,7 +616,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;