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:
19cb71e
)
Fix EXTMS error introduced by commit 94ed2c6
author
Matt Caswell
<matt@openssl.org>
Tue, 22 Nov 2016 09:31:12 +0000
(09:31 +0000)
committer
Matt Caswell
<matt@openssl.org>
Wed, 23 Nov 2016 09:50:26 +0000
(09:50 +0000)
Commit
94ed2c6
dropped a ! operator by mistake, which causes extended
master secret connections to fail. This puts in back.
Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/t1_enc.c
patch
|
blob
|
history
diff --git
a/ssl/t1_enc.c
b/ssl/t1_enc.c
index 37cd25d8dd663d1097239f987157638048f1279e..d97b9a8ea904d096a28200f01c33d70d9fb6d805 100644
(file)
--- a/
ssl/t1_enc.c
+++ b/
ssl/t1_enc.c
@@
-480,7
+480,7
@@
int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
* handshake hash). This will need to be removed later
*/
if ((s->session->flags & SSL_SESS_FLAG_EXTMS)
- && SSL_IS_TLS13(s)) {
+ &&
!
SSL_IS_TLS13(s)) {
unsigned char hash[EVP_MAX_MD_SIZE * 2];
size_t hashlen;
/*