diff --git a/src/ssl.c b/src/ssl.c
index baf086e65..2fd727bf7 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -7111,7 +7111,7 @@ long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt)
 
 long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt)
 {
-    WOLFSSL_STUB("wolfSSL_CTX_ctrl");
+    WOLFSSL_STUB("SSL_CTX_ctrl");
     (void)ctx;
     (void)cmd;
     (void)opt;
@@ -11432,7 +11432,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
     {
         /* TODO:, not needed in goahead */
         (void)ctx;
-        return WOLFSSL_NOT_IMPLEMENTED;
+        WOLFSSL_STUB("SSL_CTX_set_default_verify_paths");
+        return SSL_NOT_IMPLEMENTED;
     }
 
     #if defined(WOLFCRYPT_HAVE_SRP) && !defined(NO_SHA256) \
@@ -11759,6 +11760,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
                                           void(*f)(int, int, void*), void* data)
     {
         /* no tmp key needed, actual generation not supported */
+        WOLFSSL_STUB("RSA_generate_key");
         WOLFSSL_ENTER("RSA_generate_key");
         (void)len;
         (void)bits;
@@ -11846,6 +11848,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
     {
         /* wolfSSL has internal buffer, compatibility only */
         WOLFSSL_ENTER("BIO_set_write_buffer_size");
+        WOLFSSL_STUB("BIO_set_write_buffer_size");
         (void)bio;
         return size;
     }
@@ -14165,7 +14168,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
         (void)add;
         (void)len;
         (void)entropy;
-
+        WOLFSSL_STUB("RAND_add");
         /* wolfSSL seeds/adds internally, use explicit RNG if you want
            to take control */
     }
@@ -14424,6 +14427,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
     {
         /* TODO: */
         (void)ssl;
+        WOLFSSL_STUB("SSL_get_mode");
         return 0;
     }
 
@@ -14432,6 +14436,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
     {
         /* TODO: */
         (void)ctx;
+        WOLFSSL_STUB("SSL_CTX_get_mode");
         return 0;
     }
 
@@ -14441,6 +14446,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
         /* TODO: maybe? */
         (void)ctx;
         (void)m;
+        WOLFSSL_STUB("SL_CTX_set_default_read_ahead");
     }
 
 
@@ -14452,7 +14458,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
         (void)ctx;
         (void)sid_ctx;
         (void)sid_ctx_len;
-        return WOLFSSL_SUCCESS;
+        WOLFSSL_STUB("SSL_CTX_set_session_id_context");
+        return SSL_SUCCESS;
     }
 
 
@@ -14564,7 +14571,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
         (void)line;
         (void)data;
         (void)flags;
-        WOLFSSL_STUB("wolfSSL_ERR_get_error_line_data");
+        WOLFSSL_STUB("ERR_get_error_line_data");
 
         return 0;
     }
@@ -16541,6 +16548,7 @@ int wolfSSL_set_session_id_context(WOLFSSL* ssl, const unsigned char* id,
     (void)ssl;
     (void)id;
     (void)len;
+    WOLFSSL_STUB("SSL_set_session_id_context");
     return 0;
 }
 
@@ -17040,6 +17048,7 @@ int wolfSSL_OCSP_parse_url(char* url, char** host, char** port, char** path,
     (void)port;
     (void)path;
     (void)ssl;
+    WOLFSSL_STUB("OCSP_parse_url");
     return 0;
 }
 
@@ -17113,6 +17122,7 @@ WOLFSSL_BIO_METHOD* wolfSSL_BIO_s_mem(void)
 
 WOLFSSL_BIO_METHOD* wolfSSL_BIO_f_base64(void)
 {
+    WOLFSSL_STUB("BIO_f_base64");
     return 0;
 }
 
@@ -17121,13 +17131,14 @@ void wolfSSL_BIO_set_flags(WOLFSSL_BIO* bio, int flags)
 {
     (void)bio;
     (void)flags;
+    WOLFSSL_STUB("BIO_set_flags");
 }
 
 
 
 void wolfSSL_RAND_screen(void)
 {
-
+    WOLFSSL_STUB("RAND_screen");
 }
 
 
@@ -17135,6 +17146,7 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
 {
     (void)fname;
     (void)len;
+    WOLFSSL_STUB("RAND_file_name");
     return 0;
 }
 
@@ -17142,6 +17154,7 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
 int wolfSSL_RAND_write_file(const char* fname)
 {
     (void)fname;
+    WOLFSSL_STUB("RAND_write_file");
     return 0;
 }
 
@@ -17167,12 +17180,14 @@ int wolfSSL_RAND_egd(const char* path)
 
 WOLFSSL_COMP_METHOD* wolfSSL_COMP_zlib(void)
 {
+    WOLFSSL_STUB("COMP_zlib");
     return 0;
 }
 
 
 WOLFSSL_COMP_METHOD* wolfSSL_COMP_rle(void)
 {
+    WOLFSSL_STUB("COMP_rle");
     return 0;
 }
 
@@ -17180,6 +17195,7 @@ int wolfSSL_COMP_add_compression_method(int method, void* data)
 {
     (void)method;
     (void)data;
+    WOLFSSL_STUB("COMP_add_compression_method");
     return 0;
 }
 
@@ -17187,6 +17203,7 @@ int wolfSSL_COMP_add_compression_method(int method, void* data)
 void wolfSSL_set_dynlock_create_callback(WOLFSSL_dynlock_value* (*f)(
                                                           const char*, int))
 {
+    WOLFSSL_STUB("CRYPTO_set_dynlock_create_callback");
     (void)f;
 }
 
@@ -17194,6 +17211,7 @@ void wolfSSL_set_dynlock_create_callback(WOLFSSL_dynlock_value* (*f)(
 void wolfSSL_set_dynlock_lock_callback(
              void (*f)(int, WOLFSSL_dynlock_value*, const char*, int))
 {
+    WOLFSSL_STUB("CRYPTO_set_set_dynlock_lock_callback");
     (void)f;
 }
 
@@ -17201,6 +17219,7 @@ void wolfSSL_set_dynlock_lock_callback(
 void wolfSSL_set_dynlock_destroy_callback(
                   void (*f)(WOLFSSL_dynlock_value*, const char*, int))
 {
+    WOLFSSL_STUB("CRYPTO_set_set_dynlock_destroy_callback");
     (void)f;
 }
 
@@ -17219,6 +17238,7 @@ int wolfSSL_X509_LOOKUP_add_dir(WOLFSSL_X509_LOOKUP* lookup, const char* dir,
     (void)lookup;
     (void)dir;
     (void)len;
+    WOLFSSL_STUB("X509_LOOKUP_add_dir");
     return 0;
 }
 
@@ -18001,6 +18021,7 @@ int wolfSSL_X509_STORE_get_by_subject(WOLFSSL_X509_STORE_CTX* ctx, int idx,
     (void)idx;
     (void)name;
     (void)obj;
+    WOLFSSL_STUB("X509_STORE_get_by_subject");
     return 0;
 }
 
@@ -18075,6 +18096,7 @@ void wolfSSL_X509_STORE_CTX_free(WOLFSSL_X509_STORE_CTX* ctx)
 void wolfSSL_X509_STORE_CTX_cleanup(WOLFSSL_X509_STORE_CTX* ctx)
 {
     (void)ctx;
+    /* Do nothing */
 }
 
 
@@ -18095,6 +18117,7 @@ int wolfSSL_X509_verify_cert(WOLFSSL_X509_STORE_CTX* ctx)
 WOLFSSL_ASN1_TIME* wolfSSL_X509_CRL_get_lastUpdate(WOLFSSL_X509_CRL* crl)
 {
     (void)crl;
+    WOLFSSL_STUB("X509_CRL_get_lastUpdate");
     return 0;
 }
 
@@ -18120,6 +18143,7 @@ void wolfSSL_X509_STORE_CTX_set_error(WOLFSSL_X509_STORE_CTX* ctx, int err)
 {
     (void)ctx;
     (void)err;
+    WOLFSSL_STUB("X509_STORE_CTX_set_error");
 }
 
 #ifdef OPENSSL_EXTRA
@@ -18216,6 +18240,7 @@ void wolfSSL_EVP_PKEY_free(WOLFSSL_EVP_PKEY* key)
 int wolfSSL_X509_cmp_current_time(const WOLFSSL_ASN1_TIME* asnTime)
 {
     (void)asnTime;
+    WOLFSSL_STUB("X509_cmp_current_time");
     return 0;
 }
 
@@ -18223,6 +18248,7 @@ int wolfSSL_X509_cmp_current_time(const WOLFSSL_ASN1_TIME* asnTime)
 int wolfSSL_sk_X509_REVOKED_num(WOLFSSL_X509_REVOKED* revoked)
 {
     (void)revoked;
+    WOLFSSL_STUB("sk_X509_REVOKED_num");
     return 0;
 }
 
@@ -18231,6 +18257,7 @@ int wolfSSL_sk_X509_REVOKED_num(WOLFSSL_X509_REVOKED* revoked)
 WOLFSSL_X509_REVOKED* wolfSSL_X509_CRL_get_REVOKED(WOLFSSL_X509_CRL* crl)
 {
     (void)crl;
+    WOLFSSL_STUB("X509_CRL_get_REVOKED");
     return 0;
 }
 
@@ -18423,6 +18450,7 @@ int wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER* a,
 {
     (void)a;
     (void)b;
+    WOLFSSL_STUB("ASN1_INTEGER_cmp");
     return 0;
 }
 
@@ -18430,6 +18458,7 @@ int wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER* a,
 long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER* i)
 {
     (void)i;
+    WOLFSSL_STUB("ASN1_INTEGER_get");
     return 0;
 }
 
@@ -18450,7 +18479,8 @@ void* wolfSSL_X509_STORE_CTX_get_ex_data(WOLFSSL_X509_STORE_CTX* ctx, int idx)
 
 int wolfSSL_get_ex_data_X509_STORE_CTX_idx(void)
 {
-    WOLFSSL_ENTER("wolfSSL_get_ex_data_X509_STORE_CTX_idx");
+    WOLFSSL_ENTER("SSL_get_ex_data_X509_STORE_CTX_idx");
+    WOLFSSL_STUB("SSL_get_ex_data_X509_STORE_CTX_idx");
     return 0;
 }
 
@@ -18460,6 +18490,8 @@ void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX* ctx,
 {
     (void)ctx;
     (void)f;
+    WOLFSSL_STUB("CTX_set_info_callback");
+
 }
 
 
@@ -18483,6 +18515,7 @@ int wolfSSL_ERR_GET_REASON(unsigned long err)
         return PEM_R_NO_START_LINE;
 #endif
     (void)err;
+    WOLFSSL_STUB("ERR_GET_REASON");
     return 0;
 }
 
@@ -18490,6 +18523,7 @@ int wolfSSL_ERR_GET_REASON(unsigned long err)
 char* wolfSSL_alert_type_string_long(int alertID)
 {
     (void)alertID;
+    WOLFSSL_STUB("SSL_aalert_type_string_long");
     return 0;
 }
 
@@ -18497,6 +18531,7 @@ char* wolfSSL_alert_type_string_long(int alertID)
 char* wolfSSL_alert_desc_string_long(int alertID)
 {
     (void)alertID;
+    WOLFSSL_STUB("SSL_alert_desc_string_long");
     return 0;
 }
 
@@ -18504,6 +18539,7 @@ char* wolfSSL_alert_desc_string_long(int alertID)
 char* wolfSSL_state_string_long(const WOLFSSL* ssl)
 {
     (void)ssl;
+    WOLFSSL_STUB("SSL_state_string_long");
     return 0;
 }
 
@@ -18514,6 +18550,7 @@ int wolfSSL_PEM_def_callback(char* name, int num, int w, void* key)
     (void)num;
     (void)w;
     (void)key;
+    WOLFSSL_STUB("PEM_def_callback");
     return 0;
 }
 
@@ -19681,6 +19718,7 @@ int wolfSSL_ASN1_UTCTIME_print(WOLFSSL_BIO* bio, const WOLFSSL_ASN1_UTCTIME* a)
 {
     (void)bio;
     (void)a;
+    WOLFSSL_STUB("ASN1_UTCTIME_print");
     return 0;
 }
 
@@ -19729,6 +19767,7 @@ int wolfSSL_ASN1_GENERALIZEDTIME_print(WOLFSSL_BIO* bio,
 int  wolfSSL_sk_num(WOLFSSL_X509_REVOKED* rev)
 {
     (void)rev;
+    WOLFSSL_STUB("OPENSSL_sk_num");
     return 0;
 }
 
@@ -19737,6 +19776,7 @@ void* wolfSSL_sk_value(WOLFSSL_X509_REVOKED* rev, int i)
 {
     (void)rev;
     (void)i;
+    WOLFSSL_STUB("OPENSSL_sk_value");
     return 0;
 }
 
@@ -20206,14 +20246,16 @@ WOLFSSL_BN_CTX* wolfSSL_BN_CTX_new(void)
     static int ctx;  /* wolfcrypt doesn't now need ctx */
 
     WOLFSSL_MSG("wolfSSL_BN_CTX_new");
-
+    WOLFSSL_STUB("SSL_BN_CTX_new");
     return (WOLFSSL_BN_CTX*)&ctx;
+
 }
 
 void wolfSSL_BN_CTX_init(WOLFSSL_BN_CTX* ctx)
 {
     (void)ctx;
     WOLFSSL_MSG("wolfSSL_BN_CTX_init");
+    WOLFSSL_STUB("SSL_BN_CTX_init");
 }
 
 
@@ -20221,7 +20263,7 @@ void wolfSSL_BN_CTX_free(WOLFSSL_BN_CTX* ctx)
 {
     (void)ctx;
     WOLFSSL_MSG("wolfSSL_BN_CTX_free");
-
+    WOLFSSL_STUB("SSL_BN_CTX_free");
     /* do free since static ctx that does nothing */
 }
 
@@ -20540,9 +20582,9 @@ int wolfSSL_mask_bits(WOLFSSL_BIGNUM* bn, int n)
 {
     (void)bn;
     (void)n;
-    WOLFSSL_MSG("wolfSSL_BN_mask_bits");
-
-    return WOLFSSL_FAILURE;
+    WOLFSSL_ENTER("wolfSSL_BN_mask_bits");
+    WOLFSSL_STUB("SSL_BN_mask_bits");
+    return SSL_FAILURE;
 }
 
 
@@ -20862,8 +20904,8 @@ int wolfSSL_BN_dec2bn(WOLFSSL_BIGNUM** bn, const char* str)
     (void)str;
 
     WOLFSSL_MSG("wolfSSL_BN_dec2bn");
-
-    return WOLFSSL_FAILURE;
+    WOLFSSL_STUB("BN_dec2bn");
+    return SSL_FAILURE;
 }
 
 
@@ -21139,6 +21181,7 @@ void wolfSSL_BN_CTX_start(WOLFSSL_BN_CTX *ctx)
     (void)ctx;
 
     WOLFSSL_ENTER("wolfSSL_BN_CTX_start");
+    WOLFSSL_STUB("SSL_BN_CTX_start");
     WOLFSSL_MSG("wolfSSL_BN_CTX_start TBD");
 }
 
@@ -22130,7 +22173,7 @@ int wolfSSL_RSA_blinding_on(WOLFSSL_RSA* rsa, WOLFSSL_BN_CTX* bn)
 {
     (void)rsa;
     (void)bn;
-
+    WOLFSSL_STUB("RSA_blinding_on");
     WOLFSSL_MSG("wolfSSL_RSA_blinding_on");
 
     return WOLFSSL_SUCCESS;  /* on by default */
@@ -23208,6 +23251,7 @@ WOLFSSL_DSA* wolfSSL_EVP_PKEY_get1_DSA(WOLFSSL_EVP_PKEY* key)
 WOLFSSL_EC_KEY* wolfSSL_EVP_PKEY_get1_EC_KEY(WOLFSSL_EVP_PKEY* key)
 {
     (void)key;
+    WOLFSSL_STUB("EVP_PKEY_get1_EC_KEY");
     WOLFSSL_MSG("wolfSSL_EVP_PKEY_get1_EC_KEY not implemented");
 
     return NULL;
@@ -23303,7 +23347,7 @@ void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
 const WOLFSSL_EVP_MD* wolfSSL_EVP_ripemd160(void)
 {
     WOLFSSL_MSG("wolfSSL_ripemd160");
-
+    WOLFSSL_STUB("EVP_ripemd160");
     return NULL;
 }
 
@@ -24168,7 +24212,7 @@ int wolfSSL_EC_KEY_set_group(WOLFSSL_EC_KEY *key, WOLFSSL_EC_GROUP *group)
     (void)group;
 
     WOLFSSL_ENTER("wolfSSL_EC_KEY_set_group");
-    WOLFSSL_MSG("wolfSSL_EC_KEY_set_group TBD");
+    WOLFSSL_STUB("EC_KEY_set_group");
 
     return -1;
 }
@@ -24246,7 +24290,7 @@ void wolfSSL_EC_KEY_set_asn1_flag(WOLFSSL_EC_KEY *key, int asn1_flag)
     (void)asn1_flag;
 
     WOLFSSL_ENTER("wolfSSL_EC_KEY_set_asn1_flag");
-    WOLFSSL_MSG("wolfSSL_EC_KEY_set_asn1_flag TBD");
+    WOLFSSL_STUB("wolfSSL_EC_KEY_set_asn1_flag");
 }
 
 /* return code compliant with OpenSSL :
@@ -24375,7 +24419,7 @@ void wolfSSL_EC_GROUP_set_asn1_flag(WOLFSSL_EC_GROUP *group, int flag)
     (void)flag;
 
     WOLFSSL_ENTER("wolfSSL_EC_GROUP_set_asn1_flag");
-    WOLFSSL_MSG("wolfSSL_EC_GROUP_set_asn1_flag TBD");
+    WOLFSSL_STUB("EC_GROUP_set_asn1_flag");
 }
 
 WOLFSSL_EC_GROUP *wolfSSL_EC_GROUP_new_by_curve_name(int nid)
@@ -25023,7 +25067,7 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x)
 {
     (void)fp;
     (void)x;
-
+    WOLFSSL_STUB("PEM_write_EC_PUBKEY");
     WOLFSSL_MSG("wolfSSL_PEM_write_EC_PUBKEY not implemented");
 
     return WOLFSSL_FAILURE;
@@ -25047,7 +25091,7 @@ int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ecc,
     (void)len;
     (void)cb;
     (void)arg;
-
+    WOLFSSL_STUB("PEM_write_bio_ECPrivateKey");
     WOLFSSL_MSG("wolfSSL_PEM_write_bio_ECPrivateKey not implemented");
 
     return WOLFSSL_FAILURE;
@@ -25383,7 +25427,7 @@ int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x)
 {
     (void)fp;
     (void)x;
-
+    WOLFSSL_STUB("PEM_write_DSA_PUBKEY");
     WOLFSSL_MSG("wolfSSL_PEM_write_DSA_PUBKEY not implemented");
 
     return WOLFSSL_FAILURE;
@@ -25554,7 +25598,7 @@ WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x,
     (void)x;
     (void)cb;
     (void)u;
-
+    WOLFSSL_STUB("PEM_read_RSAPublicKey");
     WOLFSSL_MSG("wolfSSL_PEM_read_RSAPublicKey not implemented");
 
     return NULL;
@@ -25567,7 +25611,7 @@ int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x)
 {
     (void)fp;
     (void)x;
-
+    WOLFSSL_STUB("PEM_write_RSAPublicKey");
     WOLFSSL_MSG("wolfSSL_PEM_write_RSAPublicKey not implemented");
 
     return WOLFSSL_FAILURE;
@@ -25580,7 +25624,7 @@ int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x)
 {
     (void)fp;
     (void)x;
-
+    WOLFSSL_STUB("PEM_write_RSA_PUBKEY");
     WOLFSSL_MSG("wolfSSL_PEM_write_RSA_PUBKEY not implemented");
 
     return WOLFSSL_FAILURE;
@@ -27412,7 +27456,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
     WOLFSSL_ASN1_OBJECT * wolfSSL_X509_NAME_ENTRY_get_object(WOLFSSL_X509_NAME_ENTRY *ne) {
         (void)ne;
         WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_get_object");
-        WOLFSSL_STUB("wolfSSL_X509_NAME_ENTRY_get_object");
+        WOLFSSL_STUB("X509_NAME_ENTRY_get_object");
 
         return NULL;
     }
@@ -28231,7 +28275,7 @@ WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator,
     (void)callback;
     (void)cb_arg;
     WOLFSSL_ENTER("wolfSSL_DH_generate_parameters");
-    WOLFSSL_STUB("wolfSSL_DH_generate_parameters");
+    WOLFSSL_STUB("DH_generate_parameters");
 
     return NULL;
 }
@@ -28244,7 +28288,7 @@ int wolfSSL_DH_generate_parameters_ex(WOLFSSL_DH* dh, int prime_len, int generat
     (void)callback;
     (void)dh;
     WOLFSSL_ENTER("wolfSSL_DH_generate_parameters_ex");
-    WOLFSSL_STUB("wolfSSL_DH_generate_parameters_ex");
+    WOLFSSL_STUB("DH_generate_parameters_ex");
 
     return -1;
 }
@@ -28283,7 +28327,7 @@ unsigned long wolfSSL_ERR_peek_last_error(void)
 int wolfSSL_FIPS_mode(void)
 {
     WOLFSSL_ENTER("wolfSSL_FIPS_mode");
-    WOLFSSL_STUB("wolfSSL_FIPS_mode");
+    WOLFSSL_STUB("FIPS_mode");
 
     return WOLFSSL_FAILURE;
 }
@@ -28292,7 +28336,7 @@ int wolfSSL_FIPS_mode_set(int r)
 {
     (void)r;
     WOLFSSL_ENTER("wolfSSL_FIPS_mode_set");
-    WOLFSSL_STUB("wolfSSL_FIPS_mode_set");
+    WOLFSSL_STUB("FIPS_mode_set");
 
     return WOLFSSL_FAILURE;
 }
@@ -28302,7 +28346,7 @@ int wolfSSL_RAND_set_rand_method(const void *meth)
 {
     (void) meth;
     WOLFSSL_ENTER("wolfSSL_RAND_set_rand_method");
-    WOLFSSL_STUB("wolfSSL_RAND_set_rand_method");
+    WOLFSSL_STUB("RAND_set_rand_method");
 
     /* if implemented RAND_bytes and RAND_pseudo_bytes need updated
      * those two functions will call the respective functions from meth */
@@ -28372,7 +28416,7 @@ WOLFSSL_ASN1_BIT_STRING* wolfSSL_X509_get0_pubkey_bitstr(const WOLFSSL_X509* x)
 {
     (void)x;
     WOLFSSL_ENTER("wolfSSL_X509_get0_pubkey_bitstr");
-    WOLFSSL_STUB("wolfSSL_X509_get0_pubkey_bitstr");
+    WOLFSSL_STUB("X509_get0_pubkey_bitstr");
 
     return NULL;
 }
@@ -28383,7 +28427,7 @@ int wolfSSL_CTX_add_session(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* session)
     (void)ctx;
     (void)session;
     WOLFSSL_ENTER("wolfSSL_CTX_add_session");
-    WOLFSSL_STUB("wolfSSL_CTX_add_session");
+    WOLFSSL_STUB("SSL_CTX_add_session");
 
     return WOLFSSL_SUCCESS;
 }
@@ -28393,7 +28437,7 @@ int wolfSSL_get_state(const WOLFSSL* ssl)
 {
     (void)ssl;
     WOLFSSL_ENTER("wolfSSL_get_state");
-    WOLFSSL_STUB("wolfSSL_get_state");
+    WOLFSSL_STUB("SSL_get_state");
 
     return WOLFSSL_FAILURE;
 }
@@ -28453,6 +28497,7 @@ int wolfSSL_version(WOLFSSL* ssl)
     return WOLFSSL_FAILURE;
 }
 
+
 WOLFSSL_CTX* wolfSSL_get_SSL_CTX(WOLFSSL* ssl)
 {
     WOLFSSL_ENTER("wolfSSL_get_SSL_CTX");
@@ -28467,7 +28512,6 @@ int wolfSSL_X509_NAME_get_sz(WOLFSSL_X509_NAME* name)
     return name->sz;
 }
 
-
 #ifdef HAVE_SNI
 int wolfSSL_set_tlsext_host_name(WOLFSSL* ssl, const char* host_name)
 {
@@ -28542,7 +28586,7 @@ void wolfSSL_ERR_load_BIO_strings(void) {
 void wolfSSL_THREADID_set_callback(void(*threadid_func)(void*))
 {
     WOLFSSL_ENTER("wolfSSL_THREADID_set_callback");
-    WOLFSSL_STUB("wolfSSL_THREADID_set_callback");
+    WOLFSSL_STUB("CRYPTO_THREADID_set_callback");
     (void)threadid_func;
     return;
 }
@@ -28571,7 +28615,7 @@ void wolfSSL_sk_X509_pop_free(WOLF_STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X
     (void) sk;
     (void) f;
     WOLFSSL_ENTER("wolfSSL_sk_X509_pop_free");
-    WOLFSSL_STUB("wolfSSL_sk_X509_pop_free");
+    WOLFSSL_STUB("sk_X509_pop_free");
 }
 
 #endif /* OPENSSL_EXTRA and HAVE_STUNNEL */