diff options
| author | Matt Caswell <matt@openssl.org> | 2014-06-22 23:17:40 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-06-22 23:17:40 +0100 |
| commit | 00f5ee445b9b4c41b52ba2ac1800b3bf99afae0f (patch) | |
| tree | 18e4f262e2d9d19a1ad787347a9a28f7a05206b6 /ssl | |
| parent | e7911530a9b855880ae2f989df39044adad56bd5 (diff) | |
Revert "Fix off-by-one errors in ssl_cipher_get_evp()"
This reverts commit 3d86077427f93dc46b18fee706b567ec32ac232a.
Incorrect attribution.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 05b1e5e0db..13127d725e 100644 --- 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; } - if ((i < 0) || (i >= SSL_ENC_NUM_IDX)) + if ((i < 0) || (i > SSL_ENC_NUM_IDX)) *enc=NULL; else { @@ -597,7 +597,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; |