diff options
| author | Miod Vallat <miod@openbsd.org> | 2014-06-04 03:59:58 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-06-22 23:20:39 +0100 |
| commit | ad212c1ed162f7bbb44486f656506c26ce365cba (patch) | |
| tree | b50c72b08803a1106f172b21aec232e9e9c4f94a /ssl/ssl_ciph.c | |
| parent | e1bce59fd3c712ec99308f79dfcf8bece6ce28cb (diff) | |
Fix off-by-one errors in ssl_cipher_get_evp()
In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.
Bug discovered and fixed by Miod Vallat from the OpenBSD team.
PR#3375
Diffstat (limited to 'ssl/ssl_ciph.c')
| -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 06da26acc5..58f58e0ee9 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; |