[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  aed8c47cbcc8a289bea433ead2effea035187260 (commit)
      from  cfa71c5dc80c0ad783a6c4f18e10a0819eff3edf (commit)


- Log -----------------------------------------------------------------
commit aed8c47cbcc8a289bea433ead2effea035187260
Author: Johannes Bauer <joe at johannes-bauer.com>
Date:   Wed Oct 23 14:03:32 2019 +0200

    Cleanup hardcoded cipher suite codepoints in s_server
    
    The hardcoded code points for TLSv1.3 cipher suites are used in the TLS
    PSK server callback. However, they seem to have been refactored a while
    ago to use tls13_aes128gcmsha256_id, so these defines are not necessary
    within the s_server code anymore.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10243)

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

Summary of changes:
 apps/s_server.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index ab409db701..0380468080 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -182,9 +182,6 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
 }
 #endif
 
-#define TLS13_AES_128_GCM_SHA256_BYTES  ((const unsigned char *)"\x13\x01")
-#define TLS13_AES_256_GCM_SHA384_BYTES  ((const unsigned char *)"\x13\x02")
-
 static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
                                size_t identity_len, SSL_SESSION **sess)
 {