From 763e9370bf1bc6d771ccbdef16357492a3f71c0c Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Wed, 15 Jul 2015 13:48:31 -0600 Subject: [PATCH] WOLFSSL_STUB log for debug message --- src/ssl.c | 30 +++++++++++++++++++++++++++++- wolfssl/wolfcrypt/logging.h | 5 +++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/ssl.c b/src/ssl.c index 7e40efa64..3dbd22bbd 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -15158,6 +15158,9 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md) { (void) *d; (void) n; (void) *md; + WOLFSSL_ENTER("wolfSSL_SHA1"); + WOLFSSL_STUB("wolfssl_SHA1"); + return NULL; } @@ -15165,6 +15168,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)ctx; (void)x; WOLFSSL_ENTER("WOLFSSL_CTX_use_certificate"); + WOLFSSL_STUB("WOLFSSL_CTX_use_certificate"); return 0; } @@ -15173,6 +15177,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)ctx; (void)pkey; WOLFSSL_ENTER("WOLFSSL_CTX_use_PrivateKey"); + WOLFSSL_STUB("WOLFSSL_CTX_use_PrivateKey"); return 0; } @@ -15181,6 +15186,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)filename; (void)mode; WOLFSSL_ENTER("wolfSSL_BIO_new_file"); + WOLFSSL_STUB("wolfSSL_BIO_new_file"); return NULL; } @@ -15189,18 +15195,22 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)b; (void)name; WOLFSSL_ENTER("wolfSSL_BIO_read_filename"); + WOLFSSL_STUB("wolfSSL_BIO_read_filename"); return 0; } WOLFSSL_BIO_METHOD* WOLFSSL_BIO_s_file(void) { WOLFSSL_ENTER("WOLFSSL_BIO_s_file"); + WOLFSSL_STUB("WOLFSSL_BIO_s_file"); + return NULL; } const char * wolf_OBJ_nid2sn(int n) { (void)n; WOLFSSL_ENTER("wolf_OBJ_nid2sn"); + WOLFSSL_STUB("wolf_OBJ_nid2sn"); return 0; } @@ -15208,6 +15218,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) int wolf_OBJ_obj2nid(const WOLFSSL_ASN1_OBJECT *o) { (void)o; WOLFSSL_ENTER("wolf_OBJ_obj2nid"); + WOLFSSL_STUB("wolf_OBJ_obj2nid"); return 0; } @@ -15215,6 +15226,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) int wolf_OBJ_sn2nid(const char *sn) { (void)sn; WOLFSSL_ENTER("wolf_OBJ_osn2nid"); + WOLFSSL_STUB("wolf_OBJ_osn2nid"); return 0; } @@ -15225,6 +15237,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)cb; (void)u; WOLFSSL_ENTER("PEM_read_bio_DHparams"); + WOLFSSL_STUB("PEM_read_bio_DHparams"); return NULL; } @@ -15235,6 +15248,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)cb; (void)u; WOLFSSL_ENTER("PEM_read_bio_WOLFSSL_X509"); + WOLFSSL_STUB("PEM_read_bio_WOLFSSL_X509"); return NULL; } @@ -15243,6 +15257,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)bp; (void)x; WOLFSSL_ENTER("PEM_write_bio_WOLFSSL_X509"); + WOLFSSL_STUB("PEM_write_bio_WOLFSSL_X509"); return 0; } @@ -15251,14 +15266,17 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)ctx; (void)dh; WOLFSSL_ENTER("WOLFSSL_CTX_set_tmp_dh"); + WOLFSSL_STUB("WOLFSSL_CTX_set_tmp_dh"); return 0; } - void wolfSSL_CTX_set_verify_depth(WOLFSSL_CTX *ctx,int depth) { + void wolfSSL_CTX_set_verify_depth(WOLFSSL_CTX *ctx, int depth) { (void)ctx; (void)depth; WOLFSSL_ENTER("wolfSSL_CTX_set_verify_depth"); + WOLFSSL_STUB("wolfSSL_CTX_set_verify_depth"); + } void* WOLFSSL_get_app_data( const WOLFSSL *ssl) @@ -15266,6 +15284,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) /* checkout exdata stuff... */ (void)ssl; WOLFSSL_ENTER("WOLFSSL_get_app_data"); + WOLFSSL_STUB("WOLFSSL_get_app_data"); return 0; } @@ -15274,11 +15293,13 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)ssl; (void)arg; WOLFSSL_ENTER("WOLFSSL_set_app_data"); + WOLFSSL_STUB("WOLFSSL_set_app_data"); } 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"); return NULL; } @@ -15287,6 +15308,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) (void)name; (void)loc; WOLFSSL_ENTER("WOLFSSL_X509_NAME_get_entry"); + WOLFSSL_STUB("WOLFSSL_X509_NAME_get_entry"); return NULL; } @@ -15294,24 +15316,30 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl) void WOLFSSL_X509_NAME_free(WOLFSSL_X509_NAME *name){ FreeX509Name(name); WOLFSSL_ENTER("WOLFSSL_X509_NAME_free"); + WOLFSSL_STUB("WOLFSSL_X509_NAME_free"); } void wolfSSL_sk_X509_NAME_pop_free(STACK_OF(WOLFSSL_X509_NAME)* sk, void f (WOLFSSL_X509_NAME*)){ (void) sk; (void) f; WOLFSSL_ENTER("wolfSSL_sk_X509_NAME_pop_free"); + WOLFSSL_STUB("wolfSSL_sk_X509_NAME_pop_free"); } int wolfSSL_X509_check_private_key(WOLFSSL_X509 *x509, WOLFSSL_EVP_PKEY *key){ (void) x509; (void) key; WOLFSSL_ENTER("wolfSSL_X509_check_private_key"); + WOLFSSL_STUB("wolfSSL_X509_check_private_key"); + return SSL_SUCCESS; } STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list( STACK_OF(WOLFSSL_X509_NAME) *sk ){ (void) sk; WOLFSSL_ENTER("wolfSSL_dup_CA_list"); + WOLFSSL_STUB("wolfSSL_dup_CA_list"); + return NULL; } diff --git a/wolfssl/wolfcrypt/logging.h b/wolfssl/wolfcrypt/logging.h index 0b124835b..2e604080d 100644 --- a/wolfssl/wolfcrypt/logging.h +++ b/wolfssl/wolfcrypt/logging.h @@ -46,9 +46,13 @@ typedef void (*wolfSSL_Logging_cb)(const int logLevel, WOLFSSL_API int wolfSSL_SetLoggingCb(wolfSSL_Logging_cb log_function); #ifdef DEBUG_WOLFSSL + /* a is prepended to m and b is appended, creating a log msg a + m + b */ + #define WOLFSSL_LOG_CAT(a, m, b) #a " " m " " #b void WOLFSSL_ENTER(const char* msg); void WOLFSSL_LEAVE(const char* msg, int ret); + #define WOLFSSL_STUB(m) \ + WOLFSSL_MSG(WOLFSSL_LOG_CAT(wolfSSL Stub, m, not implemented)) void WOLFSSL_ERROR(int); void WOLFSSL_MSG(const char* msg); @@ -57,6 +61,7 @@ WOLFSSL_API int wolfSSL_SetLoggingCb(wolfSSL_Logging_cb log_function); #define WOLFSSL_ENTER(m) #define WOLFSSL_LEAVE(m, r) + #define WOLFSSL_STUB(m) #define WOLFSSL_ERROR(e) #define WOLFSSL_MSG(m)