Update logging enter, exit, msg to match function names. Fix some typos and improper use of "enter". Fix internal uses of `SSL_SUCCESS` and `SSL_FAILURE`. Add `WOLFSSL_DEBUG_NONBLOCK` option to allow printing iterations without debug enabled.

examples/server/server.c

@@ -273,7 +273,7 @@ static int TestEmbedSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
 
     (void)ssl;
 
-    WOLFSSL_ENTER("TestEmbedSendTo()");
+    WOLFSSL_ENTER("TestEmbedSendTo");
 
     if (dtlsCtx->failOnce) {
         word32 seq = 0;

src/bio.c

@@ -1040,7 +1040,7 @@ WOLFSSL_BIO* wolfSSL_BIO_next(WOLFSSL_BIO* bio)
 /* BIO_wpending returns the number of bytes pending to be written. */
 size_t wolfSSL_BIO_wpending(const WOLFSSL_BIO *bio)
 {
-    WOLFSSL_ENTER("BIO_wpending");
+    WOLFSSL_ENTER("wolfSSL_BIO_wpending");
 
     if (bio == NULL)
         return 0;
@@ -1913,7 +1913,7 @@ int wolfSSL_BIO_pending(WOLFSSL_BIO* bio)
 
 int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
 {
-    WOLFSSL_ENTER("BIO_flush");
+    WOLFSSL_ENTER("wolfSSL_BIO_flush");
 
     if (bio == NULL)
         return WOLFSSL_FAILURE;
@@ -1962,7 +1962,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
     {
         static WOLFSSL_BIO_METHOD meth;
 
-        WOLFSSL_ENTER("BIO_f_buffer");
+        WOLFSSL_ENTER("wolfSSL_BIO_f_buffer");
         meth.type = WOLFSSL_BIO_BUFFER;
 
         return &meth;
@@ -1972,11 +1972,12 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
     long wolfSSL_BIO_set_write_buffer_size(WOLFSSL_BIO* bio, long size)
     {
         /* wolfSSL has internal buffer, compatibility only */
-        WOLFSSL_ENTER("BIO_set_write_buffer_size");
-        WOLFSSL_MSG("Buffer resize failed");
         WOLFSSL_STUB("BIO_set_write_buffer_size");
+
+        WOLFSSL_MSG("Buffer resize failed");
+
         (void)bio;
-        (void) size;
+        (void)size;
 
         /* Even though this is only a STUB at the moment many user applications
          * may attempt to use this. OpenSSL documentation specifies the return
@@ -2038,7 +2039,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
     {
         WOLFSSL_BIO* bio = wolfSSL_BIO_new(wolfSSL_BIO_s_socket());
 
-        WOLFSSL_ENTER("BIO_new_socket");
+        WOLFSSL_ENTER("wolfSSL_BIO_new_socket");
         if (bio) {
             bio->type  = WOLFSSL_BIO_SOCKET;
             bio->shutdown = (byte)closeF;
@@ -2107,13 +2108,13 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
         WOLFSSL_ENTER("wolfSSL_BIO_set_conn_port");
 
         if (!b || !port) {
-            WOLFSSL_ENTER("Bad parameter");
+            WOLFSSL_MSG("Bad parameter");
             return WOLFSSL_FAILURE;
         }
 
         p = XATOI(port);
         if (!p || p < 0) {
-            WOLFSSL_ENTER("Port parsing error");
+            WOLFSSL_MSG("Port parsing error");
             return WOLFSSL_FAILURE;
         }
 
@@ -2141,7 +2142,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
         WOLFSSL_ENTER("wolfSSL_BIO_do_connect");
 
         if (!b) {
-            WOLFSSL_ENTER("Bad parameter");
+            WOLFSSL_MSG("Bad parameter");
             return WOLFSSL_FAILURE;
         }
 
@@ -2149,12 +2150,12 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
             b = b->next;
 
         if (!b) {
-            WOLFSSL_ENTER("No socket BIO in chain");
+            WOLFSSL_MSG("No socket BIO in chain");
             return WOLFSSL_FAILURE;
         }
 
         if (wolfIO_TcpConnect(&sfd, b->ip, b->port, 0) < 0 ) {
-            WOLFSSL_ENTER("wolfIO_TcpConnect error");
+            WOLFSSL_MSG("wolfIO_TcpConnect error");
             return WOLFSSL_FAILURE;
         }
 
@@ -2178,13 +2179,13 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
             b = b->next;
 
         if (!b) {
-            WOLFSSL_ENTER("No socket BIO in chain");
+            WOLFSSL_MSG("No socket BIO in chain");
             return WOLFSSL_FAILURE;
         }
 
         if (b->num == WOLFSSL_BIO_ERROR) {
             if (wolfIO_TcpBind(&sfd, b->port) < 0) {
-                WOLFSSL_ENTER("wolfIO_TcpBind error");
+                WOLFSSL_MSG("wolfIO_TcpBind error");
                 return WOLFSSL_FAILURE;
             }
             b->num = (int)sfd;
@@ -2194,13 +2195,13 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
             WOLFSSL_BIO* new_bio;
             int newfd = wolfIO_TcpAccept(b->num, NULL, NULL);
             if (newfd < 0) {
-                WOLFSSL_ENTER("wolfIO_TcpBind error");
+                WOLFSSL_MSG("wolfIO_TcpBind error");
                 return WOLFSSL_FAILURE;
             }
             /* Create a socket BIO for using the accept'ed connection */
             new_bio = wolfSSL_BIO_new_socket(newfd, BIO_CLOSE);
             if (new_bio == NULL) {
-                WOLFSSL_ENTER("wolfSSL_BIO_new_socket error");
+                WOLFSSL_MSG("wolfSSL_BIO_new_socket error");
                 CloseSocket(newfd);
                 return WOLFSSL_FAILURE;
             }
@@ -2210,7 +2211,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
                     wolfSSL_BIO_get_callback_arg(b));
             /* Push onto bio chain for user retrieval */
             if (wolfSSL_BIO_push(b, new_bio) == NULL) {
-                WOLFSSL_ENTER("wolfSSL_BIO_push error");
+                WOLFSSL_MSG("wolfSSL_BIO_push error");
                 /* newfd is closed when bio is free'd */
                 wolfSSL_BIO_free(new_bio);
                 return WOLFSSL_FAILURE;
@@ -2225,7 +2226,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
     int wolfSSL_BIO_eof(WOLFSSL_BIO* b)
     {
         int ret = 0;
-        WOLFSSL_ENTER("BIO_eof");
+        WOLFSSL_ENTER("wolfSSL_BIO_eof");
 
         if (b == NULL)
             return 1; /* Undefined in OpenSSL. Let's signal we're done. */
@@ -2683,7 +2684,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
 
     void wolfSSL_BIO_free_all(WOLFSSL_BIO* bio)
     {
-        WOLFSSL_ENTER("BIO_free_all");
+        WOLFSSL_ENTER("wolfSSL_BIO_free_all");
         while (bio) {
             WOLFSSL_BIO* next = bio->next;
             wolfSSL_BIO_free(bio);
@@ -2694,7 +2695,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
 
     WOLFSSL_BIO* wolfSSL_BIO_push(WOLFSSL_BIO* top, WOLFSSL_BIO* append)
     {
-        WOLFSSL_ENTER("BIO_push");
+        WOLFSSL_ENTER("wolfSSL_BIO_push");
         top->next    = append;
         append->prev = top;
 
@@ -3120,7 +3121,7 @@ int wolfSSL_BIO_new_bio_pair(WOLFSSL_BIO **bio1_p, size_t writebuf1,
     WOLFSSL_BIO *bio1 = NULL, *bio2 = NULL;
     int ret = 1;
 
-    WOLFSSL_ENTER("wolfSSL_BIO_new_bio_pair()");
+    WOLFSSL_ENTER("wolfSSL_BIO_new_bio_pair");
 
     if (bio1_p == NULL || bio2_p == NULL) {
         WOLFSSL_MSG("Bad Function Argument");

src/crl.c

@@ -234,7 +234,7 @@ void FreeCRL(WOLFSSL_CRL* crl, int dynamic)
     {
         int _pthread_ret = pthread_cond_destroy(&crl->cond);
         if (_pthread_ret != 0)
-            WOLFSSL_MSG("pthread_cond_destroy failed in FreeCRL()");
+            WOLFSSL_MSG("pthread_cond_destroy failed in FreeCRL");
     }
 #endif
     wc_FreeMutex(&crl->crlLock);

src/dtls13.c

@@ -343,7 +343,7 @@ int Dtls13ProcessBufferedMessages(WOLFSSL* ssl)
     word32 idx = 0;
     int ret = 0;
 
-    WOLFSSL_ENTER("Dtls13ProcessBufferedMessages()");
+    WOLFSSL_ENTER("Dtls13ProcessBufferedMessages");
 
     while (msg != NULL) {
         idx = 0;

src/internal.c

@@ -8282,7 +8282,7 @@ void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out)
 DtlsMsg* DtlsMsgNew(word32 sz, byte tx, void* heap)
 {
     DtlsMsg* msg;
-    WOLFSSL_ENTER("DtlsMsgNew()");
+    WOLFSSL_ENTER("DtlsMsgNew");
 
     (void)heap;
     msg = (DtlsMsg*)XMALLOC(sizeof(DtlsMsg), heap, DYNAMIC_TYPE_DTLS_MSG);
@@ -8309,7 +8309,7 @@ DtlsMsg* DtlsMsgNew(word32 sz, byte tx, void* heap)
 void DtlsMsgDelete(DtlsMsg* item, void* heap)
 {
     (void)heap;
-    WOLFSSL_ENTER("DtlsMsgDelete()");
+    WOLFSSL_ENTER("DtlsMsgDelete");
 
     if (item != NULL) {
         while (item->fragBucketList != NULL) {
@@ -8327,7 +8327,7 @@ void DtlsMsgDelete(DtlsMsg* item, void* heap)
 void DtlsMsgListDelete(DtlsMsg* head, void* heap)
 {
     DtlsMsg* next;
-    WOLFSSL_ENTER("DtlsMsgListDelete()");
+    WOLFSSL_ENTER("DtlsMsgListDelete");
     while (head) {
         next = head->next;
         DtlsMsgDelete(head, heap);
@@ -8342,7 +8342,7 @@ void DtlsTxMsgListClean(WOLFSSL* ssl)
 {
     DtlsMsg* head = ssl->dtls_tx_msg_list;
     DtlsMsg* next;
-    WOLFSSL_ENTER("DtlsTxMsgListClean()");
+    WOLFSSL_ENTER("DtlsTxMsgListClean");
     while (head) {
         next = head->next;
         if (VerifyForTxDtlsMsgDelete(ssl, head))
@@ -8554,7 +8554,7 @@ int DtlsMsgSet(DtlsMsg* msg, word32 seq, word16 epoch, const byte* data, byte ty
 {
     word32 fragOffsetEnd = fragOffset + fragSz;
 
-    WOLFSSL_ENTER("DtlsMsgSet()");
+    WOLFSSL_ENTER("DtlsMsgSet");
 
     if (msg == NULL || data == NULL || msg->sz != totalLen ||
             fragOffsetEnd > totalLen) {
@@ -8667,7 +8667,7 @@ int DtlsMsgSet(DtlsMsg* msg, word32 seq, word16 epoch, const byte* data, byte ty
 
 DtlsMsg* DtlsMsgFind(DtlsMsg* head, word16 epoch, word32 seq)
 {
-    WOLFSSL_ENTER("DtlsMsgFind()");
+    WOLFSSL_ENTER("DtlsMsgFind");
     while (head != NULL && !(head->epoch == epoch && head->seq == seq)) {
         head = head->next;
     }
@@ -8696,7 +8696,7 @@ void DtlsMsgStore(WOLFSSL* ssl, word16 epoch, word32 seq, const byte* data,
      */
 
     DtlsMsg* head = ssl->dtls_rx_msg_list;
-    WOLFSSL_ENTER("DtlsMsgStore()");
+    WOLFSSL_ENTER("DtlsMsgStore");
 
     if (head != NULL) {
         DtlsMsg* cur = DtlsMsgFind(head, epoch, seq);
@@ -8738,7 +8738,7 @@ void DtlsMsgStore(WOLFSSL* ssl, word16 epoch, word32 seq, const byte* data,
 /* DtlsMsgInsert() is an in-order insert. */
 DtlsMsg* DtlsMsgInsert(DtlsMsg* head, DtlsMsg* item)
 {
-    WOLFSSL_ENTER("DtlsMsgInsert()");
+    WOLFSSL_ENTER("DtlsMsgInsert");
     if (head == NULL || (item->epoch <= head->epoch &&
                          item->seq   <  head->seq)) {
         item->next = head;
@@ -8780,7 +8780,7 @@ int DtlsMsgPoolSave(WOLFSSL* ssl, const byte* data, word32 dataSz,
     DtlsMsg* item;
     int ret = 0;
 
-    WOLFSSL_ENTER("DtlsMsgPoolSave()");
+    WOLFSSL_ENTER("DtlsMsgPoolSave");
 
     if (ssl->dtls_tx_msg_list_sz > DTLS_POOL_SZ) {
         WOLFSSL_ERROR(DTLS_POOL_SZ_E);
@@ -8818,7 +8818,7 @@ int DtlsMsgPoolSave(WOLFSSL* ssl, const byte* data, word32 dataSz,
 int DtlsMsgPoolTimeout(WOLFSSL* ssl)
 {
     int result = -1;
-    WOLFSSL_ENTER("DtlsMsgPoolTimeout()");
+    WOLFSSL_ENTER("DtlsMsgPoolTimeout");
     if (ssl->dtls_timeout <  ssl->dtls_timeout_max) {
         ssl->dtls_timeout *= DTLS_TIMEOUT_MULTIPLIER;
         result = 0;
@@ -8831,7 +8831,7 @@ int DtlsMsgPoolTimeout(WOLFSSL* ssl)
 /* DtlsMsgPoolReset() deletes the stored transmit list. */
 void DtlsMsgPoolReset(WOLFSSL* ssl)
 {
-    WOLFSSL_ENTER("DtlsMsgPoolReset()");
+    WOLFSSL_ENTER("DtlsMsgPoolReset");
     if (ssl->dtls_tx_msg_list) {
         DtlsMsgListDelete(ssl->dtls_tx_msg_list, ssl->heap);
         ssl->dtls_tx_msg_list = NULL;
@@ -8864,7 +8864,7 @@ int VerifyForDtlsMsgPoolSend(WOLFSSL* ssl, byte type, word32 fragOffset)
  */
 int VerifyForTxDtlsMsgDelete(WOLFSSL* ssl, DtlsMsg* item)
 {
-    WOLFSSL_ENTER("VerifyForTxDtlsMsgDelete()");
+    WOLFSSL_ENTER("VerifyForTxDtlsMsgDelete");
     if (item->epoch < ssl->keys.dtls_epoch - 1)
         /* Messages not from current or previous epoch can be deleted */
         return 1;
@@ -8902,7 +8902,7 @@ int DtlsMsgPoolSend(WOLFSSL* ssl, int sendOnlyFirstPacket)
     DtlsMsg* pool;
     int epochOrder;
 
-    WOLFSSL_ENTER("DtlsMsgPoolSend()");
+    WOLFSSL_ENTER("DtlsMsgPoolSend");
 
     pool = ssl->dtls_tx_msg == NULL ? ssl->dtls_tx_msg_list : ssl->dtls_tx_msg;
 
@@ -15053,7 +15053,7 @@ int DoFinished(WOLFSSL* ssl, const byte* input, word32* inOutIdx, word32 size,
         if (!ssl->options.resuming) {
 #ifdef OPENSSL_EXTRA
             if (ssl->CBIS != NULL) {
-                ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, SSL_SUCCESS);
+                ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, WOLFSSL_SUCCESS);
             }
 #endif
             ssl->options.handShakeState = HANDSHAKE_DONE;
@@ -15069,7 +15069,7 @@ int DoFinished(WOLFSSL* ssl, const byte* input, word32* inOutIdx, word32 size,
         if (ssl->options.resuming) {
 #ifdef OPENSSL_EXTRA
             if (ssl->CBIS != NULL) {
-                ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, SSL_SUCCESS);
+                ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, WOLFSSL_SUCCESS);
             }
 #endif
             ssl->options.handShakeState = HANDSHAKE_DONE;
@@ -15709,7 +15709,7 @@ static int DoHandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
     if (ssl->CBIS != NULL){
         ssl->cbmode = SSL_CB_MODE_READ;
         ssl->cbtype = type;
-        ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, SSL_SUCCESS);
+        ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, WOLFSSL_SUCCESS);
     }
 #endif
 
@@ -15942,7 +15942,7 @@ static int DoHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
     int    ret = 0;
     word32 inputLength;
 
-    WOLFSSL_ENTER("DoHandShakeMsg()");
+    WOLFSSL_ENTER("DoHandShakeMsg");
 
     if (ssl->arrays == NULL) {
         byte   type;
@@ -16460,7 +16460,7 @@ int DtlsMsgDrain(WOLFSSL* ssl)
     DtlsMsg* item = ssl->dtls_rx_msg_list;
     int ret = 0;
 
-    WOLFSSL_ENTER("DtlsMsgDrain()");
+    WOLFSSL_ENTER("DtlsMsgDrain");
 
     /* While there is an item in the store list, and it is the expected
      * message, and it is complete, and there hasn't been an error in the
@@ -16505,7 +16505,7 @@ static int DoDtlsHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
     int ret = 0;
     int ignoreFinished = 0;
 
-    WOLFSSL_ENTER("DoDtlsHandShakeMsg()");
+    WOLFSSL_ENTER("DoDtlsHandShakeMsg");
 
     /* parse header */
     if (GetDtlsHandShakeHeader(ssl, input, inOutIdx, &type,
@@ -20201,13 +20201,13 @@ int SendChangeCipher(WOLFSSL* ssl)
     if (ssl->options.side == WOLFSSL_SERVER_END){
         ssl->options.serverState = SERVER_CHANGECIPHERSPEC_COMPLETE;
         if (ssl->CBIS != NULL)
-            ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, SSL_SUCCESS);
+            ssl->CBIS(ssl, SSL_CB_ACCEPT_LOOP, WOLFSSL_SUCCESS);
     }
     else{
         ssl->options.clientState =
             CLIENT_CHANGECIPHERSPEC_COMPLETE;
         if (ssl->CBIS != NULL)
-            ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, SSL_SUCCESS);
+            ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, WOLFSSL_SUCCESS);
     }
     #endif
 
@@ -21217,7 +21217,7 @@ int SendFinished(WOLFSSL* ssl)
             ssl->options.serverState = SERVER_FINISHED_COMPLETE;
             ssl->cbmode = SSL_CB_MODE_WRITE;
             if (ssl->CBIS != NULL)
-                ssl->CBIS(ssl, SSL_CB_HANDSHAKE_DONE, SSL_SUCCESS);
+                ssl->CBIS(ssl, SSL_CB_HANDSHAKE_DONE, WOLFSSL_SUCCESS);
         #endif
             ssl->options.handShakeState = HANDSHAKE_DONE;
             ssl->options.handShakeDone  = 1;
@@ -21229,7 +21229,7 @@ int SendFinished(WOLFSSL* ssl)
             ssl->options.clientState = CLIENT_FINISHED_COMPLETE;
             ssl->cbmode = SSL_CB_MODE_WRITE;
             if (ssl->CBIS != NULL)
-                ssl->CBIS(ssl, SSL_CB_HANDSHAKE_DONE, SSL_SUCCESS);
+                ssl->CBIS(ssl, SSL_CB_HANDSHAKE_DONE, WOLFSSL_SUCCESS);
         #endif
             ssl->options.handShakeState = HANDSHAKE_DONE;
             ssl->options.handShakeDone  = 1;
@@ -22618,7 +22618,7 @@ int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek)
 {
     int size;
 
-    WOLFSSL_ENTER("ReceiveData()");
+    WOLFSSL_ENTER("ReceiveData");
 
     /* reset error state */
     if (ssl->error == WANT_READ || ssl->error == WOLFSSL_ERROR_WANT_READ) {
@@ -26447,7 +26447,7 @@ static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
 #ifdef OPENSSL_EXTRA
         ssl->cbmode = SSL_CB_MODE_WRITE;
         if (ssl->CBIS != NULL)
-            ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, SSL_SUCCESS);
+            ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, WOLFSSL_SUCCESS);
 #endif
 
 #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
@@ -26579,7 +26579,7 @@ static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
 
         #ifdef OPENSSL_EXTRA
         if (ssl->CBIS != NULL) {
-            ssl->CBIS(ssl, SSL_CB_HANDSHAKE_START, SSL_SUCCESS);
+            ssl->CBIS(ssl, SSL_CB_HANDSHAKE_START, WOLFSSL_SUCCESS);
         }
         #endif
 
@@ -28707,7 +28707,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
     ssl->options.clientState = CLIENT_KEYEXCHANGE_COMPLETE;
     ssl->cbmode = SSL_CB_MODE_WRITE;
     if (ssl->CBIS != NULL)
-        ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, SSL_SUCCESS);
+        ssl->CBIS(ssl, SSL_CB_CONNECT_LOOP, WOLFSSL_SUCCESS);
 #endif
 
 #ifdef WOLFSSL_ASYNC_IO

src/pk.c

@@ -1472,7 +1472,7 @@ WOLFSSL_RSA* wolfSSL_d2i_RSAPrivateKey_bio(WOLFSSL_BIO *bio, WOLFSSL_RSA **out)
     int derLen = 0;
     int err;
 
-    WOLFSSL_ENTER("wolfSSL_d2i_RSAPrivateKey_bio()");
+    WOLFSSL_ENTER("wolfSSL_d2i_RSAPrivateKey_bio");
 
     /* Validate parameters. */
     err = (bio == NULL);
@@ -4120,7 +4120,7 @@ int wolfSSL_RSA_public_encrypt(int len, const unsigned char* from,
 #endif
     int outLen = 0;
 
-    WOLFSSL_ENTER("RSA_public_encrypt");
+    WOLFSSL_ENTER("wolfSSL_RSA_public_encrypt");
 
     /* Validate parameters. */
     if ((len < 0) || (rsa == NULL) || (rsa->internal == NULL) ||
@@ -4206,7 +4206,7 @@ int wolfSSL_RSA_public_encrypt(int len, const unsigned char* from,
     if (ret <= 0) {
         ret = -1;
     }
-    WOLFSSL_LEAVE("RSA_public_encrypt", ret);
+    WOLFSSL_LEAVE("wolfSSL_RSA_public_encrypt", ret);
     return ret;
 }
 
@@ -4233,7 +4233,7 @@ int wolfSSL_RSA_private_decrypt(int len, const unsigned char* from,
 #endif
     int outLen = 0;
 
-    WOLFSSL_ENTER("RSA_private_decrypt");
+    WOLFSSL_ENTER("wolfSSL_RSA_private_decrypt");
 
     /* Validate parameters. */
     if ((len < 0) || (rsa == NULL) || (rsa->internal == NULL) ||
@@ -4301,7 +4301,7 @@ int wolfSSL_RSA_private_decrypt(int len, const unsigned char* from,
     if (ret <= 0) {
         ret = -1;
     }
-    WOLFSSL_LEAVE("RSA_private_decrypt", ret);
+    WOLFSSL_LEAVE("wolfSSL_RSA_private_decrypt", ret);
     return ret;
 }
 
@@ -4324,7 +4324,7 @@ int wolfSSL_RSA_public_decrypt(int len, const unsigned char* from,
 #endif
     int outLen = 0;
 
-    WOLFSSL_ENTER("RSA_public_decrypt");
+    WOLFSSL_ENTER("wolfSSL_RSA_public_decrypt");
 
     /* Validate parameters. */
     if ((len < 0) || (rsa == NULL) || (rsa->internal == NULL) ||
@@ -4386,7 +4386,7 @@ int wolfSSL_RSA_public_decrypt(int len, const unsigned char* from,
     if (ret <= 0) {
         ret = -1;
     }
-    WOLFSSL_LEAVE("RSA_public_decrypt", ret);
+    WOLFSSL_LEAVE("wolfSSL_RSA_public_decrypt", ret);
     return ret;
 }
 
@@ -4924,7 +4924,7 @@ WOLFSSL_DSA* wolfSSL_DSA_generate_parameters(int bits, unsigned char* seed,
 {
     WOLFSSL_DSA* dsa;
 
-    WOLFSSL_ENTER("wolfSSL_DSA_generate_parameters()");
+    WOLFSSL_ENTER("wolfSSL_DSA_generate_parameters");
 
     (void)cb;
     (void)CBArg;
@@ -8743,7 +8743,7 @@ int wolfSSL_EC_METHOD_get_field_type(const WOLFSSL_EC_METHOD *meth)
  */
 int EccEnumToNID(int n)
 {
-    WOLFSSL_ENTER("EccEnumToNID()");
+    WOLFSSL_ENTER("EccEnumToNID");
 
     switch(n) {
         case ECC_SECP192R1:
@@ -8821,7 +8821,7 @@ int NIDToEccEnum(int nid)
     /* -1 on error. */
     int id = -1;
 
-    WOLFSSL_ENTER("NIDToEccEnum()");
+    WOLFSSL_ENTER("NIDToEccEnum");
 
     switch (nid) {
         case NID_X9_62_prime192v1:
@@ -9979,7 +9979,7 @@ size_t wolfSSL_EC_POINT_point2oct(const WOLFSSL_EC_GROUP *group,
     int compressed = ((form == POINT_CONVERSION_COMPRESSED) ? 1 : 0);
 #endif /* !HAVE_SELFTEST */
 
-    WOLFSSL_ENTER("EC_POINT_point2oct");
+    WOLFSSL_ENTER("wolfSSL_EC_POINT_point2oct");
 
     /* No BN operations performed. */
     (void)ctx;

src/quic.c

@@ -379,7 +379,7 @@ int wolfSSL_set_quic_transport_params(WOLFSSL* ssl,
     const QuicTransportParam* tp;
     int ret = WOLFSSL_SUCCESS;
 
-    WOLFSSL_ENTER("SSL_set_quic_transport_params");
+    WOLFSSL_ENTER("wolfSSL_set_quic_transport_params");
 
     if (!params || params_len == 0) {
         tp = NULL;
@@ -396,7 +396,7 @@ int wolfSSL_set_quic_transport_params(WOLFSSL* ssl,
     ssl->quic.transport_local = tp;
 
 cleanup:
-    WOLFSSL_LEAVE("SSL_set_quic_transport_params", ret);
+    WOLFSSL_LEAVE("wolfSSL_set_quic_transport_params", ret);
     return ret;
 }
 

src/tls13.c

@@ -5512,7 +5512,7 @@ static int FindPsk(WOLFSSL* ssl, PreSharedKey* psk, const byte* suite, int* err)
     }
     if (found) {
         if (sa->psk_keySz > MAX_PSK_KEY_LEN) {
-            WOLFSSL_MSG("Key len too long in FindPsk()");
+            WOLFSSL_MSG("Key len too long in FindPsk");
             ret = PSK_KEY_ERROR;
             WOLFSSL_ERROR_VERBOSE(ret);
         }
@@ -11176,7 +11176,7 @@ int DoTls13HandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
 #endif /* NO_WOLFSSL_SERVER */
     }
 
-    WOLFSSL_LEAVE("DoTls13HandShakeMsgType()", ret);
+    WOLFSSL_LEAVE("DoTls13HandShakeMsgType", ret);
     return ret;
 }
 
@@ -11198,7 +11198,7 @@ int DoTls13HandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
     byte   type;
     word32 size = 0;
 
-    WOLFSSL_ENTER("DoTls13HandShakeMsg()");
+    WOLFSSL_ENTER("DoTls13HandShakeMsg");
 
     if (ssl->arrays == NULL) {
 
@@ -11290,7 +11290,7 @@ int DoTls13HandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
         }
     }
 
-    WOLFSSL_LEAVE("DoTls13HandShakeMsg()", ret);
+    WOLFSSL_LEAVE("DoTls13HandShakeMsg", ret);
     return ret;
 }
 
@@ -11312,7 +11312,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
     int advanceState;
     int ret = 0;
 
-    WOLFSSL_ENTER("wolfSSL_connect_TLSv13()");
+    WOLFSSL_ENTER("wolfSSL_connect_TLSv13");
 
 #ifdef HAVE_ERRNO_H
     errno = 0;
@@ -11677,7 +11677,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
 
             ssl->error = 0; /* clear the error */
 
-            WOLFSSL_LEAVE("wolfSSL_connect_TLSv13()", WOLFSSL_SUCCESS);
+            WOLFSSL_LEAVE("wolfSSL_connect_TLSv13", WOLFSSL_SUCCESS);
             return WOLFSSL_SUCCESS;
 
         default:
@@ -12248,7 +12248,7 @@ int wolfSSL_set_groups(WOLFSSL* ssl, int* groups, int count)
 void wolfSSL_CTX_set_psk_client_cs_callback(WOLFSSL_CTX* ctx,
                                             wc_psk_client_cs_callback cb)
 {
-    WOLFSSL_ENTER("SSL_CTX_set_psk_client_cs_callback");
+    WOLFSSL_ENTER("wolfSSL_CTX_set_psk_client_cs_callback");
 
     if (ctx == NULL)
         return;
@@ -12269,7 +12269,7 @@ void wolfSSL_set_psk_client_cs_callback(WOLFSSL* ssl,
     byte haveRSA = 1;
     int  keySz   = 0;
 
-    WOLFSSL_ENTER("SSL_set_psk_client_cs_callback");
+    WOLFSSL_ENTER("wolfSSL_set_psk_client_cs_callback");
 
     if (ssl == NULL)
         return;
@@ -12301,7 +12301,7 @@ void wolfSSL_set_psk_client_cs_callback(WOLFSSL* ssl,
 void wolfSSL_CTX_set_psk_client_tls13_callback(WOLFSSL_CTX* ctx,
                                                wc_psk_client_tls13_callback cb)
 {
-    WOLFSSL_ENTER("SSL_CTX_set_psk_client_tls13_callback");
+    WOLFSSL_ENTER("wolfSSL_CTX_set_psk_client_tls13_callback");
 
     if (ctx == NULL)
         return;
@@ -12322,7 +12322,7 @@ void wolfSSL_set_psk_client_tls13_callback(WOLFSSL* ssl,
     byte haveRSA = 1;
     int  keySz   = 0;
 
-    WOLFSSL_ENTER("SSL_set_psk_client_tls13_callback");
+    WOLFSSL_ENTER("wolfSSL_set_psk_client_tls13_callback");
 
     if (ssl == NULL)
         return;
@@ -12354,7 +12354,7 @@ void wolfSSL_set_psk_client_tls13_callback(WOLFSSL* ssl,
 void wolfSSL_CTX_set_psk_server_tls13_callback(WOLFSSL_CTX* ctx,
                                                wc_psk_server_tls13_callback cb)
 {
-    WOLFSSL_ENTER("SSL_CTX_set_psk_server_tls13_callback");
+    WOLFSSL_ENTER("wolfSSL_CTX_set_psk_server_tls13_callback");
     if (ctx == NULL)
         return;
     ctx->havePSK = 1;
@@ -12373,7 +12373,7 @@ void wolfSSL_set_psk_server_tls13_callback(WOLFSSL* ssl,
     byte haveRSA = 1;
     int  keySz   = 0;
 
-    WOLFSSL_ENTER("SSL_set_psk_server_tls13_callback");
+    WOLFSSL_ENTER("wolfSSL_set_psk_server_tls13_callback");
     if (ssl == NULL)
         return;
 
@@ -12493,7 +12493,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
     int advanceState;
     int ret = 0;
 
-    WOLFSSL_ENTER("SSL_accept_TLSv13()");
+    WOLFSSL_ENTER("wolfSSL_accept_TLSv13");
 
 #ifdef HAVE_ERRNO_H
     errno = 0;
@@ -12983,7 +12983,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
 
             ssl->error = 0; /* clear the error */
 
-            WOLFSSL_LEAVE("SSL_accept()", WOLFSSL_SUCCESS);
+            WOLFSSL_LEAVE("wolfSSL_accept", WOLFSSL_SUCCESS);
             return WOLFSSL_SUCCESS;
 
         default :
@@ -13129,7 +13129,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz)
 {
     int ret = 0;
 
-    WOLFSSL_ENTER("SSL_write_early_data()");
+    WOLFSSL_ENTER("wolfSSL_write_early_data");
 
     if (ssl == NULL || data == NULL || sz < 0 || outSz == NULL)
         return BAD_FUNC_ARG;
@@ -13170,7 +13170,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz)
     return SIDE_ERROR;
 #endif
 
-    WOLFSSL_LEAVE("SSL_write_early_data()", ret);
+    WOLFSSL_LEAVE("wolfSSL_write_early_data", ret);
 
     if (ret < 0)
         ret = WOLFSSL_FATAL_ERROR;
@@ -13191,7 +13191,7 @@ int wolfSSL_read_early_data(WOLFSSL* ssl, void* data, int sz, int* outSz)
 {
     int ret = 0;
 
-    WOLFSSL_ENTER("wolfSSL_read_early_data()");
+    WOLFSSL_ENTER("wolfSSL_read_early_data");
 
 
     if (ssl == NULL || data == NULL || sz < 0 || outSz == NULL)
@@ -13239,7 +13239,7 @@ int wolfSSL_read_early_data(WOLFSSL* ssl, void* data, int sz, int* outSz)
     return SIDE_ERROR;
 #endif
 
-    WOLFSSL_LEAVE("wolfSSL_read_early_data()", ret);
+    WOLFSSL_LEAVE("wolfSSL_read_early_data", ret);
 
     if (ret < 0)
         ret = WOLFSSL_FATAL_ERROR;

src/wolfio.c

@@ -401,7 +401,7 @@ int EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
     SOCKADDR_S* peer;
     XSOCKLENT peerSz = 0;
 
-    WOLFSSL_ENTER("EmbedReceiveFrom()");
+    WOLFSSL_ENTER("EmbedReceiveFrom");
 
     if (dtlsCtx->connected) {
         peer = NULL;
@@ -561,7 +561,7 @@ int EmbedSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
     const SOCKADDR_S* peer = NULL;
     XSOCKLENT peerSz = 0;
 
-    WOLFSSL_ENTER("EmbedSendTo()");
+    WOLFSSL_ENTER("EmbedSendTo");
 
     if (!isDGramSock(sd)) {
         /* Probably a TCP socket. peer and peerSz MUST be NULL and 0 */
@@ -596,7 +596,7 @@ int EmbedReceiveFromMcast(WOLFSSL *ssl, char *buf, int sz, void *ctx)
     int recvd;
     int sd = dtlsCtx->rfd;
 
-    WOLFSSL_ENTER("EmbedReceiveFromMcast()");
+    WOLFSSL_ENTER("EmbedReceiveFromMcast");
 
     recvd = (int)DTLS_RECVFROM_FUNCTION(sd, buf, sz, ssl->rflags, NULL, NULL);
 
@@ -2290,7 +2290,7 @@ int MicriumReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
     NET_SOCK_RTN_CODE ret;
     NET_ERR err;
 
-    WOLFSSL_ENTER("MicriumReceiveFrom()");
+    WOLFSSL_ENTER("MicriumReceiveFrom");
 
 #ifdef WOLFSSL_DTLS
     {
@@ -2369,7 +2369,7 @@ int MicriumSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
     NET_SOCK_RTN_CODE ret;
     NET_ERR err;
 
-    WOLFSSL_ENTER("MicriumSendTo()");
+    WOLFSSL_ENTER("MicriumSendTo");
 
     ret = NetSock_TxDataTo(sd, buf, sz, ssl->wflags,
                            (NET_SOCK_ADDR*)dtlsCtx->peer.sa,

src/x509.c

@@ -128,7 +128,7 @@ int wolfSSL_X509_get_ext_count(const WOLFSSL_X509* passedCert)
     DecodedCert cert[1];
 #endif
 
-    WOLFSSL_ENTER("wolfSSL_X509_get_ext_count()");
+    WOLFSSL_ENTER("wolfSSL_X509_get_ext_count");
     if (passedCert == NULL) {
         WOLFSSL_MSG("\tNot passed a certificate");
         return WOLFSSL_FAILURE;
@@ -4168,7 +4168,7 @@ void wolfSSL_sk_GENERAL_NAME_pop_free(WOLFSSL_STACK* sk,
 
 void wolfSSL_sk_GENERAL_NAME_free(WOLFSSL_STACK* sk)
 {
-    WOLFSSL_ENTER("sk_GENERAL_NAME_free");
+    WOLFSSL_ENTER("wolfSSL_sk_GENERAL_NAME_free");
     wolfSSL_sk_X509_pop_free(sk, NULL);
 }
 #endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
@@ -4221,7 +4221,7 @@ WOLFSSL_DIST_POINT* wolfSSL_DIST_POINT_new(void)
     WOLFSSL_DIST_POINT* dp = NULL;
     WOLFSSL_DIST_POINT_NAME* dpn = NULL;
 
-    WOLFSSL_ENTER("DIST_POINT_new");
+    WOLFSSL_ENTER("wolfSSL_DIST_POINT_new");
 
     dp = (WOLFSSL_DIST_POINT*)XMALLOC(sizeof(WOLFSSL_DIST_POINT), NULL,
                                       DYNAMIC_TYPE_OPENSSL);
@@ -4322,7 +4322,7 @@ void wolfSSL_sk_DIST_POINT_pop_free(WOLFSSL_STACK* sk,
 
 void wolfSSL_sk_DIST_POINT_free(WOLFSSL_STACK* sk)
 {
-    WOLFSSL_ENTER("sk_DIST_POINT_free");
+    WOLFSSL_ENTER("wolfSSL_sk_DIST_POINT_free");
     wolfSSL_sk_free(sk);
 }
 
@@ -4856,7 +4856,7 @@ WOLFSSL_X509_NAME* wolfSSL_X509_get_subject_name(WOLFSSL_X509* cert)
 WOLFSSL_ABI
 WOLFSSL_X509_NAME* wolfSSL_X509_get_issuer_name(WOLFSSL_X509* cert)
 {
-    WOLFSSL_ENTER("X509_get_issuer_name");
+    WOLFSSL_ENTER("wolfSSL_X509_get_issuer_name");
     if (cert)
         return &cert->issuer;
     return NULL;
@@ -4986,7 +4986,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
 
     (void)ret;
 
-    WOLFSSL_ENTER("X509_get_pubkey");
+    WOLFSSL_ENTER("wolfSSL_X509_get_pubkey");
     if (x509 != NULL) {
         key = wolfSSL_EVP_PKEY_new_ex(x509->heap);
         if (key != NULL) {
@@ -8679,7 +8679,7 @@ void wolfSSL_X509_ALGOR_free(WOLFSSL_X509_ALGOR *alg)
 /* Returns X509_ALGOR struct with signature algorithm */
 const WOLFSSL_X509_ALGOR* wolfSSL_X509_get0_tbs_sigalg(const WOLFSSL_X509 *x509)
 {
-    WOLFSSL_ENTER("X509_get0_tbs_sigalg");
+    WOLFSSL_ENTER("wolfSSL_X509_get0_tbs_sigalg");
 
     if (x509 == NULL) {
         WOLFSSL_MSG("x509 struct NULL error");
@@ -8693,7 +8693,7 @@ const WOLFSSL_X509_ALGOR* wolfSSL_X509_get0_tbs_sigalg(const WOLFSSL_X509 *x509)
 void wolfSSL_X509_ALGOR_get0(const WOLFSSL_ASN1_OBJECT **paobj, int *pptype,
                             const void **ppval, const WOLFSSL_X509_ALGOR *algor)
 {
-    WOLFSSL_ENTER("X509_ALGOR_get0");
+    WOLFSSL_ENTER("wolfSSL_X509_ALGOR_get0");
 
     if (!algor) {
         WOLFSSL_MSG("algor object is NULL");
@@ -8790,7 +8790,7 @@ void wolfSSL_X509_PUBKEY_free(WOLFSSL_X509_PUBKEY *x)
 /* Returns X509_PUBKEY structure containing X509_ALGOR and EVP_PKEY */
 WOLFSSL_X509_PUBKEY* wolfSSL_X509_get_X509_PUBKEY(const WOLFSSL_X509* x509)
 {
-    WOLFSSL_ENTER("X509_get_X509_PUBKEY");
+    WOLFSSL_ENTER("wolfSSL_X509_get_X509_PUBKEY");
 
     if (x509 == NULL) {
         WOLFSSL_MSG("x509 struct NULL error");
@@ -8806,7 +8806,7 @@ int wolfSSL_X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg,
      const unsigned char **pk, int *ppklen, WOLFSSL_X509_ALGOR **pa,
      WOLFSSL_X509_PUBKEY *pub)
 {
-    WOLFSSL_ENTER("X509_PUBKEY_get0_param");
+    WOLFSSL_ENTER("wolfSSL_X509_PUBKEY_get0_param");
 
     if (!pub || !pub->pubKeyOID) {
         WOLFSSL_MSG("X509_PUBKEY struct not populated");
@@ -9251,7 +9251,7 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_chain_up_ref(
         int i;
         #endif
 
-        WOLFSSL_ENTER("wolfSSL_X509_to_Cert()");
+        WOLFSSL_ENTER("wolfSSL_X509_to_Cert");
 
         if (x509 == NULL || cert == NULL) {
             return BAD_FUNC_ARG;
@@ -11095,7 +11095,7 @@ err:
         int nid = -1;
         WOLFSSL_X509_NAME_ENTRY* ne = NULL;
 
-        WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_create_by_txt()");
+        WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_create_by_txt");
 
         if (txt == NULL) {
             return NULL;
@@ -11145,7 +11145,7 @@ err:
         WOLFSSL_X509_NAME_ENTRY* ne;
 
 #ifdef WOLFSSL_DEBUG_OPENSSL
-        WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_create_by_NID()");
+        WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_create_by_NID");
 #endif
 
         if (!data) {
@@ -11282,7 +11282,7 @@ err:
         int ret, i;
 
 #ifdef WOLFSSL_DEBUG_OPENSSL
-        WOLFSSL_ENTER("wolfSSL_X509_NAME_add_entry()");
+        WOLFSSL_ENTER("wolfSSL_X509_NAME_add_entry");
 #endif
 
         if (name == NULL || entry == NULL || entry->value == NULL) {
@@ -11530,7 +11530,7 @@ int wolfSSL_PEM_write_bio_X509_REQ(WOLFSSL_BIO *bp, WOLFSSL_X509 *x)
     int derSz;
     int ret;
 
-    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509_REQ()");
+    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509_REQ");
 
     if (x == NULL || bp == NULL) {
         return WOLFSSL_FAILURE;
@@ -11579,7 +11579,7 @@ int wolfSSL_PEM_write_bio_X509_AUX(WOLFSSL_BIO *bp, WOLFSSL_X509 *x)
     int derSz;
     int ret;
 
-    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509_AUX()");
+    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509_AUX");
 
     if (bp == NULL || x == NULL) {
         WOLFSSL_MSG("NULL argument passed in");
@@ -11624,7 +11624,7 @@ int wolfSSL_PEM_write_bio_X509(WOLFSSL_BIO *bio, WOLFSSL_X509 *cert)
     int derSz = X509_BUFFER_SZ;
     int ret;
 
-    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509()");
+    WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509");
 
     if (bio == NULL || cert == NULL) {
         WOLFSSL_MSG("NULL argument passed in");
@@ -12791,7 +12791,7 @@ WOLFSSL_X509* wolfSSL_X509_dup(WOLFSSL_X509 *x)
 #if defined(OPENSSL_EXTRA)
 int wolfSSL_X509_check_ca(WOLFSSL_X509 *x509)
 {
-    WOLFSSL_ENTER("X509_check_ca");
+    WOLFSSL_ENTER("wolfSSL_X509_check_ca");
 
     if (x509 == NULL)
         return WOLFSSL_FAILURE;
@@ -12943,7 +12943,7 @@ int wolfSSL_X509_NAME_copy(WOLFSSL_X509_NAME* from, WOLFSSL_X509_NAME* to)
  * returns WOLFSSL_SUCCESS on success */
 int wolfSSL_X509_set_subject_name(WOLFSSL_X509 *cert, WOLFSSL_X509_NAME *name)
 {
-    WOLFSSL_ENTER("X509_set_subject_name");
+    WOLFSSL_ENTER("wolfSSL_X509_set_subject_name");
     if (cert == NULL || name == NULL)
         return WOLFSSL_FAILURE;
 
@@ -12964,7 +12964,7 @@ int wolfSSL_X509_set_subject_name(WOLFSSL_X509 *cert, WOLFSSL_X509_NAME *name)
  * returns WOLFSSL_SUCCESS on success */
 int wolfSSL_X509_set_issuer_name(WOLFSSL_X509 *cert, WOLFSSL_X509_NAME *name)
 {
-    WOLFSSL_ENTER("X509_set_issuer_name");
+    WOLFSSL_ENTER("wolfSSL_X509_set_issuer_name");
     if (cert == NULL || name == NULL)
         return WOLFSSL_FAILURE;
 

src/x509_str.c

@@ -45,7 +45,7 @@
 WOLFSSL_X509_STORE_CTX* wolfSSL_X509_STORE_CTX_new(void)
 {
     WOLFSSL_X509_STORE_CTX* ctx;
-    WOLFSSL_ENTER("X509_STORE_CTX_new");
+    WOLFSSL_ENTER("wolfSSL_X509_STORE_CTX_new");
 
     ctx = (WOLFSSL_X509_STORE_CTX*)XMALLOC(sizeof(WOLFSSL_X509_STORE_CTX), NULL,
                                     DYNAMIC_TYPE_X509_CTX);
@@ -122,7 +122,7 @@ int wolfSSL_X509_STORE_CTX_init(WOLFSSL_X509_STORE_CTX* ctx,
 /* free's extra data */
 void wolfSSL_X509_STORE_CTX_free(WOLFSSL_X509_STORE_CTX* ctx)
 {
-    WOLFSSL_ENTER("X509_STORE_CTX_free");
+    WOLFSSL_ENTER("wolfSSL_X509_STORE_CTX_free");
     if (ctx != NULL) {
 #ifdef HAVE_EX_DATA_CLEANUP_HOOKS
         wolfSSL_CRYPTO_cleanup_ex_data(&ctx->ex_data);
@@ -715,7 +715,7 @@ WOLFSSL_X509_STORE* wolfSSL_X509_STORE_new(void)
 {
     int ret;
     WOLFSSL_X509_STORE* store = NULL;
-    WOLFSSL_ENTER("SSL_X509_STORE_new");
+    WOLFSSL_ENTER("wolfSSL_X509_STORE_new");
 
     if ((store = (WOLFSSL_X509_STORE*)XMALLOC(sizeof(WOLFSSL_X509_STORE), NULL,
                                     DYNAMIC_TYPE_X509_STORE)) == NULL)
@@ -917,7 +917,7 @@ int wolfSSL_X509_STORE_set_ex_data_with_cleanup(
     void wolfSSL_X509_STORE_set_verify_cb(WOLFSSL_X509_STORE *st,
                                  WOLFSSL_X509_STORE_CTX_verify_cb verify_cb)
     {
-        WOLFSSL_ENTER("WOLFSSL_X509_STORE_set_verify_cb");
+        WOLFSSL_ENTER("wolfSSL_X509_STORE_set_verify_cb");
         if (st != NULL) {
             st->verify_cb = verify_cb;
         }
@@ -927,7 +927,7 @@ int wolfSSL_X509_STORE_set_ex_data_with_cleanup(
 WOLFSSL_X509_LOOKUP* wolfSSL_X509_STORE_add_lookup(WOLFSSL_X509_STORE* store,
                                                WOLFSSL_X509_LOOKUP_METHOD* m)
 {
-    WOLFSSL_ENTER("SSL_X509_STORE_add_lookup");
+    WOLFSSL_ENTER("wolfSSL_X509_STORE_add_lookup");
     if (store == NULL || m == NULL)
         return NULL;
 
@@ -1007,7 +1007,7 @@ WOLFSSL_API int wolfSSL_X509_STORE_load_locations(WOLFSSL_X509_STORE *str,
     ReadDirCtx  readCtx[1];
 #endif
 
-    WOLFSSL_ENTER("X509_STORE_load_locations");
+    WOLFSSL_ENTER("wolfSSL_X509_STORE_load_locations");
 
     if (str == NULL || str->cm == NULL || (file == NULL  && dir == NULL))
         return WOLFSSL_FAILURE;

wolfcrypt/src/asn.c

@@ -5779,7 +5779,7 @@ int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
 #ifndef WOLFSSL_ASN_TEMPLATE
     int ret, length;
 
-    WOLFSSL_ENTER("GetObjectId()");
+    WOLFSSL_ENTER("GetObjectId");
 
     ret = GetASNObjectId(input, inOutIdx, &length, maxIdx);
     if (ret != 0)
@@ -5790,7 +5790,7 @@ int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
     ASNGetData dataASN[objectIdASN_Length];
     int ret;
 
-    WOLFSSL_ENTER("GetObjectId()");
+    WOLFSSL_ENTER("GetObjectId");
 
     /* Clear dynamic data and set OID type expected. */
     XMEMSET(dataASN, 0, sizeof(dataASN));
@@ -6841,7 +6841,7 @@ int wc_CreatePKCS8Key(byte* out, word32* outSz, byte* key, word32 keySz,
         return LENGTH_ONLY_E;
     }
 
-    WOLFSSL_ENTER("wc_CreatePKCS8Key()");
+    WOLFSSL_ENTER("wc_CreatePKCS8Key");
 
     if (key == NULL || out == NULL || outSz == NULL) {
         return BAD_FUNC_ARG;
@@ -6914,7 +6914,7 @@ int wc_CreatePKCS8Key(byte* out, word32* outSz, byte* key, word32 keySz,
     word32 keyIdx = 0;
     word32 tmpAlgId = 0;
 
-    WOLFSSL_ENTER("wc_CreatePKCS8Key()");
+    WOLFSSL_ENTER("wc_CreatePKCS8Key");
 
     /* Check validity of parameters. */
     if (out == NULL && outSz != NULL) {
@@ -8785,7 +8785,7 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
 
     (void)heap;
 
-    WOLFSSL_ENTER("EncryptContent()");
+    WOLFSSL_ENTER("EncryptContent");
 
     if (CheckAlgo(vPKCS, vAlgo, &id, &version, &blockSz) < 0)
         return ASN_INPUT_E;  /* Algo ID error */
@@ -8952,7 +8952,7 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
 
     (void)heap;
 
-    WOLFSSL_ENTER("EncryptContent()");
+    WOLFSSL_ENTER("EncryptContent");
 
     /* Must have a output size to return or check. */
     if (outSz == NULL) {

wolfcrypt/src/ecc.c

@@ -5175,7 +5175,7 @@ int wc_ecc_make_pub(ecc_key* key, ecc_point* pubOut)
  */
 int wc_ecc_make_pub_ex(ecc_key* key, ecc_point* pubOut, WC_RNG* rng)
 {
-    WOLFSSL_ENTER("wc_ecc_make_pub");
+    WOLFSSL_ENTER("wc_ecc_make_pub_ex");
 
     return ecc_make_pub_ex(key, NULL, pubOut, rng);
 }

wolfcrypt/src/evp.c

@@ -1739,7 +1739,7 @@ int wolfSSL_EVP_PKEY_CTX_free(WOLFSSL_EVP_PKEY_CTX *ctx)
 #else
      return 0;
 #endif
-    WOLFSSL_ENTER("EVP_PKEY_CTX_free");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_CTX_free");
     if (ctx->pkey != NULL)
         wolfSSL_EVP_PKEY_free(ctx->pkey);
     if (ctx->peerKey != NULL)
@@ -1764,7 +1764,7 @@ WOLFSSL_EVP_PKEY_CTX *wolfSSL_EVP_PKEY_CTX_new(WOLFSSL_EVP_PKEY *pkey, WOLFSSL_E
 
     if (pkey == NULL) return 0;
     if (e != NULL) return 0;
-    WOLFSSL_ENTER("EVP_PKEY_CTX_new");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_CTX_new");
 
     ctx = (WOLFSSL_EVP_PKEY_CTX*)XMALLOC(sizeof(WOLFSSL_EVP_PKEY_CTX), NULL,
             DYNAMIC_TYPE_PUBLIC_KEY);
@@ -1801,7 +1801,7 @@ WOLFSSL_EVP_PKEY_CTX *wolfSSL_EVP_PKEY_CTX_new(WOLFSSL_EVP_PKEY *pkey, WOLFSSL_E
 int wolfSSL_EVP_PKEY_CTX_set_rsa_padding(WOLFSSL_EVP_PKEY_CTX *ctx, int padding)
 {
     if (ctx == NULL) return 0;
-    WOLFSSL_ENTER("EVP_PKEY_CTX_set_rsa_padding");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_CTX_set_rsa_padding");
     ctx->padding = padding;
     return WOLFSSL_SUCCESS;
 }
@@ -1817,7 +1817,7 @@ int wolfSSL_EVP_PKEY_CTX_set_signature_md(WOLFSSL_EVP_PKEY_CTX *ctx,
     const EVP_MD* md)
 {
     if (ctx == NULL) return 0;
-    WOLFSSL_ENTER("EVP_PKEY_CTX_set_signature_md");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_CTX_set_signature_md");
 #ifndef NO_RSA
     ctx->md = md;
 #else
@@ -2254,7 +2254,7 @@ int wolfSSL_EVP_PKEY_decrypt(WOLFSSL_EVP_PKEY_CTX *ctx,
 {
     int len = 0;
 
-    WOLFSSL_ENTER("EVP_PKEY_decrypt");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_decrypt");
 
     if (ctx == NULL || ctx->pkey == NULL) {
         WOLFSSL_MSG("Bad parameter.");
@@ -2318,7 +2318,7 @@ int wolfSSL_EVP_PKEY_decrypt(WOLFSSL_EVP_PKEY_CTX *ctx,
 int wolfSSL_EVP_PKEY_decrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx)
 {
     if (ctx == NULL) return WOLFSSL_FAILURE;
-    WOLFSSL_ENTER("EVP_PKEY_decrypt_init");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_decrypt_init");
     switch (ctx->pkey->type) {
     case EVP_PKEY_RSA:
         ctx->op = EVP_PKEY_OP_DECRYPT;
@@ -2351,7 +2351,7 @@ int wolfSSL_EVP_PKEY_encrypt(WOLFSSL_EVP_PKEY_CTX *ctx,
 {
     int len = 0;
 
-    WOLFSSL_ENTER("EVP_PKEY_encrypt");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_encrypt");
 
     if (ctx == NULL || ctx->pkey == NULL) {
         WOLFSSL_MSG("Bad parameter.");
@@ -2422,7 +2422,7 @@ int wolfSSL_EVP_PKEY_encrypt(WOLFSSL_EVP_PKEY_CTX *ctx,
 int wolfSSL_EVP_PKEY_encrypt_init(WOLFSSL_EVP_PKEY_CTX *ctx)
 {
     if (ctx == NULL) return WOLFSSL_FAILURE;
-    WOLFSSL_ENTER("EVP_PKEY_encrypt_init");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_encrypt_init");
 
     switch (ctx->pkey->type) {
     case EVP_PKEY_RSA:
@@ -2703,7 +2703,7 @@ int wolfSSL_EVP_PKEY_bits(const WOLFSSL_EVP_PKEY *pkey)
     int bytes;
 
     if (pkey == NULL) return 0;
-    WOLFSSL_ENTER("EVP_PKEY_bits");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_bits");
     if ((bytes = wolfSSL_EVP_PKEY_size((WOLFSSL_EVP_PKEY*)pkey)) ==0) return 0;
     return bytes*8;
 }
@@ -2923,7 +2923,7 @@ int wolfSSL_EVP_PKEY_keygen(WOLFSSL_EVP_PKEY_CTX *ctx,
 int wolfSSL_EVP_PKEY_size(WOLFSSL_EVP_PKEY *pkey)
 {
     if (pkey == NULL) return 0;
-    WOLFSSL_ENTER("EVP_PKEY_size");
+    WOLFSSL_ENTER("wolfSSL_EVP_PKEY_size");
 
     switch (pkey->type) {
 #ifndef NO_RSA
@@ -4841,7 +4841,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
     /* return a pointer to MD4 EVP type */
     const WOLFSSL_EVP_MD* wolfSSL_EVP_md4(void)
     {
-        WOLFSSL_ENTER("wolfSSL_EVP_md4");
+        WOLFSSL_ENTER("EVP_md4");
         return EVP_get_digestbyname("MD4");
     }
 
@@ -5675,7 +5675,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
     int wolfSSL_EVP_MD_CTX_cleanup(WOLFSSL_EVP_MD_CTX* ctx)
     {
         int ret = WOLFSSL_SUCCESS;
-        WOLFSSL_ENTER("EVP_MD_CTX_cleanup");
+        WOLFSSL_ENTER("wolfSSL_EVP_MD_CTX_cleanup");
         if (ctx->pctx != NULL)
             wolfSSL_EVP_PKEY_CTX_free(ctx->pctx);
 
@@ -5777,7 +5777,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
 
     void wolfSSL_EVP_CIPHER_CTX_init(WOLFSSL_EVP_CIPHER_CTX* ctx)
     {
-        WOLFSSL_ENTER("EVP_CIPHER_CTX_init");
+        WOLFSSL_ENTER("wolfSSL_EVP_CIPHER_CTX_init");
         if (ctx) {
             XMEMSET(ctx, 0, sizeof(WOLFSSL_EVP_CIPHER_CTX));
             ctx->cipherType = WOLFSSL_EVP_CIPH_TYPE_INIT;   /* not yet initialized */
@@ -5801,7 +5801,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
         (void)arg;
         (void)ptr;
 
-        WOLFSSL_ENTER("EVP_CIPHER_CTX_ctrl");
+        WOLFSSL_ENTER("wolfSSL_EVP_CIPHER_CTX_ctrl");
 
         switch(type) {
             case EVP_CTRL_INIT:
@@ -5987,7 +5987,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
     /* WOLFSSL_SUCCESS on ok */
     int wolfSSL_EVP_CIPHER_CTX_cleanup(WOLFSSL_EVP_CIPHER_CTX* ctx)
     {
-        WOLFSSL_ENTER("EVP_CIPHER_CTX_cleanup");
+        WOLFSSL_ENTER("wolfSSL_EVP_CIPHER_CTX_cleanup");
         if (ctx) {
 #if (!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)) || \
     (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))

wolfcrypt/src/pkcs12.c

@@ -2347,7 +2347,7 @@ WC_PKCS12* wc_PKCS12_create(char* pass, word32 passSz, char* name,
     word32 certCiSz;
     word32 keyCiSz;
 
-    WOLFSSL_ENTER("wc_PKCS12_create()");
+    WOLFSSL_ENTER("wc_PKCS12_create");
 
     if (wc_InitRng_ex(&rng, heap, INVALID_DEVID) != 0) {
         return NULL;

wolfcrypt/src/port/maxim/maxq10xx.c

@@ -1852,7 +1852,7 @@ static int maxq10xx_read_device_cert_der(byte* p_dest_buff, word32* p_len)
     int pk_offset = 0;
 #endif
 
-    WOLFSSL_ENTER("maxq10xx_read_device_cert_der()");
+    WOLFSSL_ENTER("maxq10xx_read_device_cert_der");
     if (!p_dest_buff || !p_len) {
         return BAD_FUNC_ARG;
     }
@@ -2025,7 +2025,7 @@ static int maxq10xx_tls12_ecc_shared_secret(WOLFSSL* ssl, ecc_key* otherKey,
     (void)outlen;
     (void)side;
 
-    WOLFSSL_ENTER("maxq10xx_ecc_shared_secret()");
+    WOLFSSL_ENTER("maxq10xx_ecc_shared_secret");
 
     if (ssl->specs.kea != ecc_diffie_hellman_kea) {
         WOLFSSL_MSG("MAXQ: key exchange algo not supported");
@@ -2215,7 +2215,7 @@ static int maxq10xx_create_dh_key(byte* p, word32 pSz, byte* g, word32 gSz,
     int rc;
     mxq_err_t mxq_rc;
 
-    WOLFSSL_ENTER("maxq10xx_create_dh_key()");
+    WOLFSSL_ENTER("maxq10xx_create_dh_key");
     if (!tls13active) {
         return NOT_COMPILED_IN;
     }
@@ -2278,7 +2278,7 @@ static int maxq10xx_dh_agree(WOLFSSL* ssl, struct DhKey* key,
     (void)priv;
     (void)privSz;
 
-    WOLFSSL_ENTER("maxq10xx_dh_agree()");
+    WOLFSSL_ENTER("maxq10xx_dh_agree");
 
     mxq_u2 csid_param = ssl->options.cipherSuite |
                         (ssl->options.cipherSuite0 << 8);
@@ -2330,7 +2330,7 @@ static int  maxq10xx_ecc_key_gen(WOLFSSL* ssl, ecc_key* key, word32 keySz,
     (void)ctx;
     (void)ssl;
 
-    WOLFSSL_ENTER("maxq10xx_ecc_key_gen()");
+    WOLFSSL_ENTER("maxq10xx_ecc_key_gen");
 
     if (tls13_ecc_obj_id == -1) {
         tls13_ecc_obj_id = alloc_temp_key_id();
@@ -2375,7 +2375,7 @@ static int maxq10xx_ecc_verify(WOLFSSL* ssl, const byte* sig,
     (void)keySz;
     (void)ctx;
 
-    WOLFSSL_ENTER("maxq10xx_ecc_verify()");
+    WOLFSSL_ENTER("maxq10xx_ecc_verify");
 
     if (!tls13active) {
         return CRYPTOCB_UNAVAILABLE;
@@ -2418,7 +2418,7 @@ static int maxq10xx_tls13_ecc_shared_secret(WOLFSSL* ssl, ecc_key* otherKey,
     (void)side;
     (void)pubKeySz;
 
-    WOLFSSL_ENTER("maxq10xx_ecc_shared_secret()");
+    WOLFSSL_ENTER("maxq10xx_ecc_shared_secret");
 
     rc = wc_ecc_export_public_raw(otherKey, qx, &qxLen, qy, &qyLen);
 
@@ -3331,7 +3331,7 @@ static int maxq10xx_perform_tls13_record_processing(WOLFSSL* ssl,
         return rc;
     }
 
-    WOLFSSL_MSG("MAXQ: MXQ_TLS13_Update_IV()");
+    WOLFSSL_MSG("MAXQ: MXQ_TLS13_Update_IV");
     mxq_rc = MXQ_TLS13_Update_IV( key_id, (mxq_u1 *)iv, ivSz);
     if (mxq_rc) {
         WOLFSSL_ERROR_MSG("MAXQ: MXQ_TLS13_Update_IV() failed");

wolfcrypt/test/test.c

@@ -14604,7 +14604,7 @@ static int rsa_nb_test(RsaKey* key, const byte* in, word32 inLen, byte* out,
     if (ret < 0) {
         return ret;
     }
-#ifdef DEBUG_WOLFSSL
+#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
     printf("RSA non-block sign: %d times\n", count);
 #endif
     signSz = ret;
@@ -14622,7 +14622,7 @@ static int rsa_nb_test(RsaKey* key, const byte* in, word32 inLen, byte* out,
     if (ret < 0) {
         return ret;
     }
-#ifdef DEBUG_WOLFSSL
+#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
     printf("RSA non-block verify: %d times\n", count);
 #endif
 
@@ -14642,7 +14642,7 @@ static int rsa_nb_test(RsaKey* key, const byte* in, word32 inLen, byte* out,
     if (ret < 0) {
         return ret;
     }
-#ifdef DEBUG_WOLFSSL
+#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
     printf("RSA non-block inline verify: %d times\n", count);
 #endif
 
@@ -26474,7 +26474,7 @@ static int crypto_ecc_verify(const byte *key, uint32_t keySz,
 
             /* This is where real-time work could be called */
         } while (ret == FP_WOULDBLOCK);
-    #ifdef DEBUG_WOLFSSL
+    #if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
         printf("ECC non-block verify: %d times\n", count);
     #endif
         if (ret < 0)
@@ -26563,7 +26563,7 @@ static int crypto_ecc_sign(const byte *key, uint32_t keySz,
             /* This is where real-time work could be called */
         } while (ret == FP_WOULDBLOCK);
 
-    #ifdef DEBUG_WOLFSSL
+    #if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
         printf("ECC non-block sign: %d times\n", count);
     #endif
         if (ret < 0)
@@ -26629,7 +26629,7 @@ static int ecc_test_nonblock_dhe(int curveId, word32 curveSz,
         if (ret < 0)
             ret = -16120;
     }
-#ifdef DEBUG_WOLFSSL
+#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
     fprintf(stderr, "ECC non-block key gen: %d times\n", count);
 #endif
     if (ret == 0) {
@@ -26652,7 +26652,7 @@ static int ecc_test_nonblock_dhe(int curveId, word32 curveSz,
         if (ret < 0)
             ret = -16123;
     }
-#ifdef DEBUG_WOLFSSL
+#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_DEBUG_NONBLOCK)
     fprintf(stderr, "ECC non-block shared secret: %d times\n", count);
 #endif
     if (ret == 0) {