From 9ad970d8a4a3dd38b2ebf1beb1be832e9865faed Mon Sep 17 00:00:00 2001
From: Carie Pointer <carie@wolfssl.com>
Date: Mon, 9 Dec 2019 14:04:52 -0700
Subject: [PATCH] Fixes for jenkins test failures

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

diff --git a/src/internal.c b/src/internal.c
index 8bfed7800..f59c877ab 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -17993,7 +17993,8 @@ const char* GetCipherEncStr(char n[][MAX_SEGMENT_SZ]) {
              (XSTRNCMP(n2,"CHACHA20",8) == 0 && XSTRNCMP(n3,"POLY1305",8) == 0))
         encStr = "CHACHA20/POLY1305(256)";
     else if ((XSTRNCMP(n0,"NULL",4) == 0) || (XSTRNCMP(n1,"NULL",4) == 0) ||
-             (XSTRNCMP(n2,"NULL",4) == 0))
+             (XSTRNCMP(n2,"NULL",4) == 0) ||
+             ((XSTRNCMP(n0,"TLS13",5) == 0) && (XSTRNCMP(n3,"",0) == 0)))
         encStr = "None";
     else if ((XSTRNCMP(n0,"IDEA",4) == 0))
         encStr = "IDEA";
@@ -18081,7 +18082,7 @@ int wolfSSL_sk_CIPHER_description(WOLFSSL_CIPHER* cipher)
     const char *keaStr, *authStr, *encStr, *macStr, *protocol;
     char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}};
     uint8_t len = UINT8_SZ-1;
-    WOLFSSL_ENTER("wolfSSL_CIPHER_sk_description");
+    WOLFSSL_ENTER("wolfSSL_sk_CIPHER_description");
 
     if (cipher == NULL)
         return WOLFSSL_FAILURE;
diff --git a/src/ssl.c b/src/ssl.c
index 5aa21ac6e..02c930f63 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -19210,7 +19210,9 @@ void wolfSSL_ACCESS_DESCRIPTION_free(WOLFSSL_ACCESS_DESCRIPTION* access)
 WOLFSSL_STACK* wolfSSL_sk_new_node(void* heap)
 {
     WOLFSSL_ENTER("wolfSSL_sk_new_node");
-    WOLFSSL_STACK* sk = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), heap,
+    WOLFSSL_STACK* sk;
+
+    sk = (WOLFSSL_STACK*)XMALLOC(sizeof(WOLFSSL_STACK), heap,
                                                           DYNAMIC_TYPE_OPENSSL);
     if (sk != NULL) {
         XMEMSET(sk, 0, sizeof(*sk));
diff --git a/tests/api.c b/tests/api.c
index 84235f082..717f24f19 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -20585,7 +20585,7 @@ static void test_wolfSSL_X509_STORE_CTX(void)
     #endif
 
     AssertNotNull(ctx = X509_STORE_CTX_new());
-    X509_STORE_CTX_set_verify_cb(ctx, (void *)verify_cb);
+    X509_STORE_CTX_set_verify_cb(ctx, verify_cb);
     X509_STORE_CTX_free(ctx);
 
 #ifdef OPENSSL_ALL