From: Andrew Dinh Date: Mon, 15 Jun 2026 02:42:05 +0000 (+0700) Subject: Remove duplicate TLS_MD_SERVER_WRITE_KEY_CONST macro defines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=711cde149ebf208695d0faa212df5445368cbd73;p=thirdparty%2Fopenssl.git Remove duplicate TLS_MD_SERVER_WRITE_KEY_CONST macro defines Reviewed-by: Nikola Pajkovsky Reviewed-by: Eugene Syromiatnikov MergeDate: Thu Jun 18 13:16:38 2026 (Merged from https://github.com/openssl/openssl/pull/31515) --- diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index d4c09e5c18a..f43dedc5ad9 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -1212,9 +1212,6 @@ int SSL_CTX_set_tlsext_ticket_key_evp_cb(SSL_CTX *ctx, int (*fp)(SSL *, unsigned /* ASCII: "client write key", in hex for EBCDIC compatibility */ #define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" #define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16 -/* ASCII: "server write key", in hex for EBCDIC compatibility */ -#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" -#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16 /* ASCII: "IV block", in hex for EBCDIC compatibility */ #define TLS_MD_IV_BLOCK_CONST "\x49\x56\x20\x62\x6c\x6f\x63\x6b" #define TLS_MD_IV_BLOCK_CONST_SIZE 8