From c83c9e68c9d45cd3f52ce94cc5d5d5d219a57c14 Mon Sep 17 00:00:00 2001
From: Colton Willey <colton@wolfssl.com>
Date: Mon, 9 Dec 2024 13:10:32 -0800
Subject: [PATCH] Updates per review comments

---
 src/ssl_load.c            | 7 +------
 wolfcrypt/src/wc_pkcs11.c | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/ssl_load.c b/src/ssl_load.c
index c2483a83c1..ed96d4aa45 100644
--- a/src/ssl_load.c
+++ b/src/ssl_load.c
@@ -4148,9 +4148,6 @@ int wolfSSL_CTX_use_AltPrivateKey_Label(WOLFSSL_CTX* ctx, const char* label,
 
 #if defined(WOLF_CRYPTO_CB) && !defined(NO_CERTS)
 
-static int wolfSSL_CTX_use_certificate_ex(WOLFSSL_CTX* ctx,
-    const char *label, const unsigned char *id, int idLen, int devId);
-
 static int wolfSSL_CTX_use_certificate_ex(WOLFSSL_CTX* ctx,
     const char *label, const unsigned char *id, int idLen, int devId)
 {
@@ -4159,7 +4156,7 @@ static int wolfSSL_CTX_use_certificate_ex(WOLFSSL_CTX* ctx,
     word32 certDataLen = 0;
     word32 labelLen = 0;
 
-    WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_label_ex");
+    WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_ex");
 
     if (label != NULL) {
         labelLen = (word32)XSTRLEN(label);
@@ -4195,7 +4192,6 @@ int wolfSSL_CTX_use_certificate_label(WOLFSSL_CTX* ctx,
     const char *label, int devId)
 {
     if ((ctx == NULL) || (label == NULL)) {
-        WOLFSSL_MSG("Bad Argument");
         return WOLFSSL_FAILURE;
     }
 
@@ -4215,7 +4211,6 @@ int wolfSSL_CTX_use_certificate_id(WOLFSSL_CTX* ctx,
     const unsigned char *id, int idLen, int devId)
 {
     if ((ctx == NULL) || (id == NULL) || (idLen <= 0)) {
-        WOLFSSL_MSG("Bad Argument");
         return WOLFSSL_FAILURE;
     }
 
diff --git a/wolfcrypt/src/wc_pkcs11.c b/wolfcrypt/src/wc_pkcs11.c
index d8565912f1..bbe292e865 100644
--- a/wolfcrypt/src/wc_pkcs11.c
+++ b/wolfcrypt/src/wc_pkcs11.c
@@ -4021,7 +4021,7 @@ static int Pkcs11GetCert(Pkcs11Session* session, wc_CryptoInfo* info) {
         goto exit;
     }
 
-    certData = XMALLOC(
+    certData = (byte *)XMALLOC(
         (int)tmpl[0].ulValueLen, info->cert.heap, DYNAMIC_TYPE_CERT);
     if (certData == NULL) {
         ret = MEMORY_E;