[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f80c864318ee86cf26492c6914299423cddbe229 (commit)
      from  b4c35656441929ce6f6be112648d637cba51dc91 (commit)


- Log -----------------------------------------------------------------
commit f80c864318ee86cf26492c6914299423cddbe229
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Apr 26 14:20:59 2018 +0100

    Fix typo in the definition of tls13_ciphers
    
    SSL_kANY, and SSL_aANY were placed in the wrong fields. It makes no
    functional difference since these macros evaluate to 0 anyway, which is
    the correct value for these fields.
    
    Fixes #6048
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6095)

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

Summary of changes:
 ssl/s3_lib.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 6193269..f797497 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -37,12 +37,12 @@ static SSL_CIPHER tls13_ciphers[] = {
         TLS1_3_RFC_AES_128_GCM_SHA256,
         TLS1_3_RFC_AES_128_GCM_SHA256,
         TLS1_3_CK_AES_128_GCM_SHA256,
-        0, 0,
+        SSL_kANY,
+        SSL_aANY,
         SSL_AES128GCM,
         SSL_AEAD,
         TLS1_3_VERSION, TLS1_3_VERSION,
-        SSL_kANY,
-        SSL_aANY,
+        0, 0,
         SSL_HIGH,
         SSL_HANDSHAKE_MAC_SHA256,
         128,