projects
/
platform
/
upstream
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
998bfea
)
Revert "Fix off-by-one errors in ssl_cipher_get_evp()"
author
Matt Caswell
<matt@openssl.org>
Sun, 22 Jun 2014 22:20:19 +0000
(23:20 +0100)
committer
Janusz Kozerski
<j.kozerski@samsung.com>
Mon, 20 Oct 2014 13:25:27 +0000
(15:25 +0200)
This reverts commit
29411a0c7a00a73e4ca42be8b5a7401d3bb5107a
.
Incorrect attribution.
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index
58f58e0
..
06da26a
100644
(file)
--- 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;