Commit 31274b3d30 for openssl.org

commit 31274b3d309ceedd4d6c2878c531948c1a517b7c
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date:   Wed May 20 12:18:52 2026 +0200

    ssl/t1_trce.c: use macros from tlssigalgs.h, reorder accordingly

    The macro definitions for the SignatureScheme values and names
    are available "include/internal/tlssigalgs.h" (contrary to what comment
    says), use them and also order the items in the order they are present
    in the header file.

    Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

    Reviewed-by: Bob Beck <beck@openssl.org>
    Reviewed-by: Neil Horman <nhorman@openssl.org>
    MergeDate: Tue Jun 23 16:29:59 2026
    (Merged from https://github.com/openssl/openssl/pull/31248)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index b2b00b3f7c..b4d67d9d24 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -586,8 +586,6 @@ static const ssl_trace_tbl ssl_sigalg_tbl[] = {
     { TLSEXT_SIGALG_ecdsa_secp384r1_sha384, TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name },
     { TLSEXT_SIGALG_ecdsa_secp521r1_sha512, TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name },
     { TLSEXT_SIGALG_ecdsa_sha224, TLSEXT_SIGALG_ecdsa_sha224_name },
-    { TLSEXT_SIGALG_ed25519, TLSEXT_SIGALG_ed25519_name },
-    { TLSEXT_SIGALG_ed448, TLSEXT_SIGALG_ed448_name },
     { TLSEXT_SIGALG_ecdsa_sha1, TLSEXT_SIGALG_ecdsa_sha1_name },
     { TLSEXT_SIGALG_rsa_pss_rsae_sha256, TLSEXT_SIGALG_rsa_pss_rsae_sha256_name },
     { TLSEXT_SIGALG_rsa_pss_rsae_sha384, TLSEXT_SIGALG_rsa_pss_rsae_sha384_name },
@@ -610,18 +608,15 @@ static const ssl_trace_tbl ssl_sigalg_tbl[] = {
     { TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name },
     { TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name },
     { TLSEXT_SIGALG_gostr34102001_gostr3411, TLSEXT_SIGALG_gostr34102001_gostr3411_name },
+    { TLSEXT_SIGALG_sm2sig_sm3, TLSEXT_SIGALG_sm2sig_sm3_name },
+    { TLSEXT_SIGALG_ed25519, TLSEXT_SIGALG_ed25519_name },
+    { TLSEXT_SIGALG_ed448, TLSEXT_SIGALG_ed448_name },
     { TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256, TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name },
     { TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384, TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name },
     { TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512, TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name },
-    /*
-     * Well known sigalgs that we happen to know about, but only come from
-     * provider capability declarations (hence no macros for the
-     * codepoints/names)
-     */
-    { 0x0904, "mldsa44" },
-    { 0x0905, "mldsa65" },
-    { 0x0906, "mldsa87" },
-    { 0x0708, "sm2sig_sm3" },
+    { TLSEXT_SIGALG_mldsa44, TLSEXT_SIGALG_mldsa44_name },
+    { TLSEXT_SIGALG_mldsa65, TLSEXT_SIGALG_mldsa65_name },
+    { TLSEXT_SIGALG_mldsa87, TLSEXT_SIGALG_mldsa87_name },
 };

 static const ssl_trace_tbl ssl_ctype_tbl[] = {