From 9b04a4f8d16370df22a25992ce0b1c500281fb30 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Thu, 23 Jan 2025 17:47:24 -0700
Subject: [PATCH] account for correct return value of cipher stack push and
 clSuite use case after rebase

---
 src/ssl.c   | 6 +++---
 src/tls13.c | 2 +-
 tests/api.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 10898d36a..1e160a9e0 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15190,7 +15190,7 @@ WOLFSSL_STACK* wolfSSL_sk_new_cipher(void)
     return sk;
 }
 
-/* return 1 on success 0 on fail */
+/* returns the number of elements in stack on success, 0 on fail */
 int wolfSSL_sk_CIPHER_push(WOLF_STACK_OF(WOLFSSL_CIPHER)* sk,
                                                       WOLFSSL_CIPHER* cipher)
 {
@@ -17835,7 +17835,7 @@ void wolfSSL_sk_GENERIC_pop_free(WOLFSSL_STACK* sk,
     wolfSSL_sk_pop_free(sk, (wolfSSL_sk_freefunc)f);
 }
 
-/* return 1 on success 0 on fail */
+/* returns the number of elements in stack on success, 0 on fail */
 int wolfSSL_sk_GENERIC_push(WOLFSSL_STACK* sk, void* generic)
 {
     WOLFSSL_ENTER("wolfSSL_sk_GENERIC_push");
@@ -22014,7 +22014,7 @@ WOLF_STACK_OF(WOLFSSL_CIPHER)*  wolfSSL_get_client_ciphers(WOLFSSL* ssl)
                 /* in_stack is checked in wolfSSL_CIPHER_description */
                 cipher.in_stack     = 1;
 
-                if (wolfSSL_sk_CIPHER_push(ret, &cipher) != WOLFSSL_SUCCESS) {
+                if (wolfSSL_sk_CIPHER_push(ret, &cipher) <= 0) {
                     WOLFSSL_MSG("Error pushing client cipher onto stack");
                     wolfSSL_sk_CIPHER_free(ret);
                     ret = NULL;
diff --git a/src/tls13.c b/src/tls13.c
index 5f9ca073d..d17d9681f 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -7055,7 +7055,7 @@ int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
         }
         /* Can't check ssl->extensions here as SigAlgs are unconditionally
            set by TLSX_PopulateExtensions */
-        if (args->clSuites->hashSigAlgoSz == 0) {
+        if (ssl->clSuites->hashSigAlgoSz == 0) {
             WOLFSSL_MSG("Client did not send a SignatureAlgorithms extension");
             ERROR_OUT(INCOMPLETE_DATA, exit_dch);
         }
diff --git a/tests/api.c b/tests/api.c
index aa17f5e84..a6e0821b1 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -61445,7 +61445,7 @@ 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);
-        ExpectStrEQ("ECDHE-RSA-AES128-GCM-SHA256",
+        ExpectStrEQ("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
             SSL_CIPHER_get_name(current));
     }
     return EXPECT_RESULT();
@@ -69840,7 +69840,7 @@ static int test_wolfSSL_X509_NAME_ENTRY(void)
     ExpectNotNull(entry = X509_NAME_ENTRY_create_by_NID(NULL, NID_commonName,
                 0x0c, cn, (int)sizeof(cn)));
     ExpectIntEQ(X509_NAME_add_entry(nm, entry, -1, 0), SSL_SUCCESS);
-    ExpectIntEQ(X509_NAME_ENTRY_set(X509_NAME_get_entry(nm, 1)), 1);
+    ExpectIntEQ(X509_NAME_ENTRY_set(X509_NAME_get_entry(nm, 1)), 2);
 
 #ifdef WOLFSSL_CERT_EXT
     ExpectIntEQ(X509_NAME_add_entry_by_txt(NULL, NULL, MBSTRING_UTF8,