Cleanup hardcoded cipher suite codepoints in s_server
authorJohannes Bauer <joe@johannes-bauer.com>
Wed, 23 Oct 2019 12:03:32 +0000 (14:03 +0200)
committerMatt Caswell <matt@openssl.org>
Mon, 28 Oct 2019 10:57:44 +0000 (10:57 +0000)
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@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10243)

apps/s_server.c

index ab409db..0380468 100644 (file)
@@ -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)
 {