Skip to content

Commit c952b69

Browse files
add back WOLFSSL_QT macro guard for order of cipher suites
1 parent a98cb45 commit c952b69

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/ssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10470,7 +10470,8 @@ const char* wolfSSL_CIPHER_get_name(const WOLFSSL_CIPHER* cipher)
1047010470
return NULL;
1047110471
}
1047210472

10473-
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS)
10473+
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) && \
10474+
!defined(WOLFSSL_QT)
1047410475
return GetCipherNameIana(cipher->cipherSuite0, cipher->cipherSuite);
1047510476
#else
1047610477
return wolfSSL_get_cipher_name_from_suite(cipher->cipherSuite0,

tests/api.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13584,7 +13584,8 @@ static int test_wolfSSL_get_client_ciphers_on_result(WOLFSSL* ssl) {
1358413584
ExpectIntEQ(sk_SSL_CIPHER_num(ciphers), 1);
1358513585
current = sk_SSL_CIPHER_value(ciphers, 0);
1358613586
ExpectNotNull(current);
13587-
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS)
13587+
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) && \
13588+
!defined(WOLFSSL_QT)
1358813589
ExpectStrEQ("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
1358913590
SSL_CIPHER_get_name(current));
1359013591
#else
@@ -26524,7 +26525,7 @@ static int test_wolfSSL_crypto_policy_ciphers(void)
2652426525

2652526526
/* We return a different cipher string depending on build settings. */
2652626527
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && \
26527-
!defined(NO_ERROR_STRINGS)
26528+
!defined(NO_ERROR_STRINGS) && !defined(WOLFSSL_QT)
2652826529
found = crypto_policy_cipher_found(ssl, "AES_128", 0);
2652926530
ExpectIntEQ(found, !is_future);
2653026531

0 commit comments

Comments
 (0)