From: Johannes Bauer Date: Wed, 23 Oct 2019 12:03:32 +0000 (+0200) Subject: Cleanup hardcoded cipher suite codepoints in s_server X-Git-Tag: openssl-3.0.0-alpha1~1080 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aed8c47cbcc8a289bea433ead2effea035187260;p=oweals%2Fopenssl.git 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10243) --- 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) {