[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  82c9c030173898b9536a1c8da4e49b4b19251dbd (commit)
      from  19cb71ef6e414759d737918bab10be2cc1d8bd99 (commit)


- Log -----------------------------------------------------------------
commit 82c9c030173898b9536a1c8da4e49b4b19251dbd
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 22 09:31:12 2016 +0000

    Fix EXTMS error introduced by commit 94ed2c6
    
    Commit 94ed2c6 dropped a ! operator by mistake, which causes extended
    master secret connections to fail. This puts in back.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 37cd25d..d97b9a8 100644
--- 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;
         /*