From c952b694f7b8eaadfec72058a2e355b43fafbcb5 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Tue, 17 Mar 2026 16:36:28 -0600 Subject: [PATCH] add back WOLFSSL_QT macro guard for order of cipher suites --- src/ssl.c | 3 ++- tests/api.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 9772b85e4ef..6987f7b26e4 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -10470,7 +10470,8 @@ const char* wolfSSL_CIPHER_get_name(const WOLFSSL_CIPHER* cipher) return NULL; } - #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) + #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) && \ + !defined(WOLFSSL_QT) return GetCipherNameIana(cipher->cipherSuite0, cipher->cipherSuite); #else return wolfSSL_get_cipher_name_from_suite(cipher->cipherSuite0, diff --git a/tests/api.c b/tests/api.c index fd16b4d5b22..6b5a23abbcd 100644 --- a/tests/api.c +++ b/tests/api.c @@ -13584,7 +13584,8 @@ static int test_wolfSSL_get_client_ciphers_on_result(WOLFSSL* ssl) { ExpectIntEQ(sk_SSL_CIPHER_num(ciphers), 1); current = sk_SSL_CIPHER_value(ciphers, 0); ExpectNotNull(current); - #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) + #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) && \ + !defined(WOLFSSL_QT) ExpectStrEQ("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", SSL_CIPHER_get_name(current)); #else @@ -26524,7 +26525,7 @@ static int test_wolfSSL_crypto_policy_ciphers(void) /* We return a different cipher string depending on build settings. */ #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && \ - !defined(NO_ERROR_STRINGS) + !defined(NO_ERROR_STRINGS) && !defined(WOLFSSL_QT) found = crypto_policy_cipher_found(ssl, "AES_128", 0); ExpectIntEQ(found, !is_future);