summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Bauer <joe@johannes-bauer.com>2019-10-23 14:03:32 +0200
committerMatt Caswell <matt@openssl.org>2019-10-28 11:01:59 +0000
commitc2183fdc1a9cd60bbfe8823822def0d09aa5ef3a (patch)
tree0a1e0e1a889556079ea135f247bc71cc87f64b7f
parent432d6953d65e7229ac138c49357856cc494ff438 (diff)
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@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10243) (cherry picked from commit aed8c47cbcc8a289bea433ead2effea035187260)
-rw-r--r--apps/s_server.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 929a08bd85..b80032c76c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -180,9 +180,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)
{