Commit df877a36ae for openssl.org

commit df877a36aee8a1a0abd230d729296ba8888712fa
Author: Neil Horman <nhorman@openssl.org>
Date:   Sat Jun 13 17:26:19 2026 -0400

    Remove duplicate defines in tls1.h

    TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256 "PSK-AES128-GCM-SHA256"
    TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384 "PSK-AES256-GCM-SHA384"

    Were defined twice identically in tls1.h

    Remove the duplicate definition

    Fixes #31484

    Reviewed-by: Milan Broz <mbroz@openssl.org>
    Reviewed-by: Norbert Pocs <norbertp@openssl.org>
    MergeDate: Mon Jun 15 16:10:01 2026
    (Merged from https://github.com/openssl/openssl/pull/31493)

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index e407a55106..d4c09e5c18 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -1103,10 +1103,6 @@ int SSL_CTX_set_tlsext_ticket_key_evp_cb(SSL_CTX *ctx, int (*fp)(SSL *, unsigned
 #define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256 "ECDH-RSA-AES128-GCM-SHA256"
 #define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384"

-/* TLS v1.2 PSK GCM ciphersuites from RFC5487 */
-#define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256 "PSK-AES128-GCM-SHA256"
-#define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384 "PSK-AES256-GCM-SHA384"
-
 /* ECDHE PSK ciphersuites from RFC 5489 */
 #define TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA "ECDHE-PSK-RC4-SHA"
 #define TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA "ECDHE-PSK-3DES-EDE-CBC-SHA"