projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d663f50
)
Fix off-by-one errors in ssl_cipher_get_evp()
author
Kurt Cancemi
<kurt@x64Architecture.com>
Wed, 4 Jun 2014 07:59:58 +0000
(
03:59
-0400)
committer
Matt Caswell
<matt@openssl.org>
Thu, 12 Jun 2014 20:17:30 +0000
(21:17 +0100)
In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.
PR#3375
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index 54ba7ef5b4acfe1c42afe53630aef7e446d34d73..704854be911341288e1041650e43612bc0e83cee 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-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;