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:
339da43
)
Revert "Fix off-by-one errors in ssl_cipher_get_evp()"
author
Matt Caswell
<matt@openssl.org>
Sun, 22 Jun 2014 21:35:56 +0000
(22:35 +0100)
committer
Matt 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
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index ad9b762101951ead9d455e39a1c0671cead0d66f..0f03b063e874c4c7fb12cd1772f51f69df19f276 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-582,7
+582,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
{
@@
-616,7
+616,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;