diff --git a/src/ssl.c b/src/ssl.c index 1c1847ff9..d0bff1188 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -7097,7 +7097,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey(int type, WOLFSSL_EVP_PKEY** out, return local; } - +#ifndef NO_WOLFSSL_STUB long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt) { WOLFSSL_STUB("SSL_ctrl"); @@ -7107,8 +7107,9 @@ long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt) (void)pt; return WOLFSSL_FAILURE; } +#endif - +#ifndef NO_WOLFSSL_STUB long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt) { WOLFSSL_STUB("SSL_CTX_ctrl"); @@ -7118,6 +7119,7 @@ long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt) (void)pt; return WOLFSSL_FAILURE; } +#endif #ifndef NO_CERTS @@ -11428,6 +11430,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) } #endif + #ifndef NO_WOLFSSL_STUB int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx) { /* TODO:, not needed in goahead */ @@ -11435,6 +11438,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_STUB("SSL_CTX_set_default_verify_paths"); return SSL_NOT_IMPLEMENTED; } + #endif #if defined(WOLFCRYPT_HAVE_SRP) && !defined(NO_SHA256) \ && !defined(WC_NO_RNG) @@ -11755,7 +11759,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return WOLFSSL_SUCCESS; } - + #ifndef NO_WOLFSSL_STUB WOLFSSL_RSA* wolfSSL_RSA_generate_key(int len, unsigned long bits, void(*f)(int, int, void*), void* data) { @@ -11768,6 +11772,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) (void)data; return NULL; } + #endif #ifndef NO_CERTS @@ -11843,7 +11848,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return &meth; } - + #ifndef NO_WOLFSSL_STUB long wolfSSL_BIO_set_write_buffer_size(WOLFSSL_BIO* bio, long size) { /* wolfSSL has internal buffer, compatibility only */ @@ -11852,7 +11857,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) (void)bio; return size; } - + #endif WOLFSSL_BIO_METHOD* wolfSSL_BIO_s_bio(void) { @@ -14162,7 +14167,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } - + #ifndef NO_WOLFSSL_STUB void wolfSSL_RAND_add(const void* add, int len, double entropy) { (void)add; @@ -14172,7 +14177,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) /* wolfSSL seeds/adds internally, use explicit RNG if you want to take control */ } - + #endif #ifndef NO_DES3 /* 0 on ok */ @@ -14342,7 +14347,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) /* nothing to do here */ } - + #ifndef NO_WOLFSSL_STUB int wolfSSL_clear(WOLFSSL* ssl) { if (ssl == NULL) { @@ -14395,7 +14400,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) return WOLFSSL_SUCCESS; } - + #endif long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t) { @@ -14422,7 +14427,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) return mode; } - + #ifndef NO_WOLFSSL_STUB long wolfSSL_SSL_get_mode(WOLFSSL* ssl) { /* TODO: */ @@ -14430,8 +14435,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) WOLFSSL_STUB("SSL_get_mode"); return 0; } + #endif - + #ifndef NO_WOLFSSL_STUB long wolfSSL_CTX_get_mode(WOLFSSL_CTX* ctx) { /* TODO: */ @@ -14439,8 +14445,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) WOLFSSL_STUB("SSL_CTX_get_mode"); return 0; } + #endif - + #ifndef NO_WOLFSSL_STUB void wolfSSL_CTX_set_default_read_ahead(WOLFSSL_CTX* ctx, int m) { /* TODO: maybe? */ @@ -14448,8 +14455,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) (void)m; WOLFSSL_STUB("SSL_CTX_set_default_read_ahead"); } + #endif - + #ifndef NO_WOLFSSL_STUB int wolfSSL_CTX_set_session_id_context(WOLFSSL_CTX* ctx, const unsigned char* sid_ctx, unsigned int sid_ctx_len) @@ -14461,7 +14469,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) WOLFSSL_STUB("SSL_CTX_set_session_id_context"); return SSL_SUCCESS; } - + #endif long wolfSSL_CTX_sess_get_cache_size(WOLFSSL_CTX* ctx) { @@ -14563,6 +14571,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) } + #ifndef NO_WOLFSSL_STUB unsigned long wolfSSL_ERR_get_error_line_data(const char** file, int* line, const char** data, int *flags) { @@ -14575,6 +14584,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) return 0; } + #endif WOLFSSL_API pem_password_cb* wolfSSL_CTX_get_default_passwd_cb( WOLFSSL_CTX *ctx) @@ -16541,7 +16551,7 @@ int wolfSSL_ASN1_STRING_to_UTF8(unsigned char **out, WOLFSSL_ASN1_STRING *in) } #endif /* NO_ASN */ - +#ifndef NO_WOLFSSL_STUB int wolfSSL_set_session_id_context(WOLFSSL* ssl, const unsigned char* id, unsigned int len) { @@ -16551,11 +16561,8 @@ int wolfSSL_set_session_id_context(WOLFSSL* ssl, const unsigned char* id, WOLFSSL_STUB("SSL_set_session_id_context"); return 0; } +#endif -#endif /* OPENSSL_EXTRA */ - - -#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EXTRA) void wolfSSL_set_connect_state(WOLFSSL* ssl) { word16 haveRSA = 1; @@ -17040,6 +17047,15 @@ WOLFSSL_X509* wolfSSL_X509_new() #endif /* NO_CERTS */ +/* was do nothing */ +/* +void OPENSSL_free(void* buf) +{ + (void)buf; +} +*/ + +#ifndef NO_WOLFSSL_STUB int wolfSSL_OCSP_parse_url(char* url, char** host, char** port, char** path, int* ssl) { @@ -17051,7 +17067,7 @@ int wolfSSL_OCSP_parse_url(char* url, char** host, char** port, char** path, WOLFSSL_STUB("OCSP_parse_url"); return 0; } - +#endif WOLFSSL_METHOD* wolfSSLv2_client_method(void) { @@ -17119,29 +17135,31 @@ WOLFSSL_BIO_METHOD* wolfSSL_BIO_s_mem(void) return &meth; } - +#ifndef NO_WOLFSSL_STUB WOLFSSL_BIO_METHOD* wolfSSL_BIO_f_base64(void) { WOLFSSL_STUB("BIO_f_base64"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_BIO_set_flags(WOLFSSL_BIO* bio, int flags) { (void)bio; (void)flags; WOLFSSL_STUB("BIO_set_flags"); } +#endif - - +#ifndef NO_WOLFSSL_STUB void wolfSSL_RAND_screen(void) { WOLFSSL_STUB("RAND_screen"); } +#endif - +#ifndef NO_WOLFSSL_STUB const char* wolfSSL_RAND_file_name(char* fname, unsigned long len) { (void)fname; @@ -17149,15 +17167,16 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len) WOLFSSL_STUB("RAND_file_name"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_RAND_write_file(const char* fname) { (void)fname; WOLFSSL_STUB("RAND_write_file"); return 0; } - +#endif int wolfSSL_RAND_load_file(const char* fname, long len) { @@ -17177,20 +17196,23 @@ int wolfSSL_RAND_egd(const char* path) } - +#ifndef NO_WOLFSSL_STUB WOLFSSL_COMP_METHOD* wolfSSL_COMP_zlib(void) { WOLFSSL_STUB("COMP_zlib"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB WOLFSSL_COMP_METHOD* wolfSSL_COMP_rle(void) { WOLFSSL_STUB("COMP_rle"); return 0; } +#endif +#ifndef NO_WOLFSSL_STUB int wolfSSL_COMP_add_compression_method(int method, void* data) { (void)method; @@ -17198,31 +17220,34 @@ int wolfSSL_COMP_add_compression_method(int method, void* data) WOLFSSL_STUB("COMP_add_compression_method"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_set_dynlock_create_callback(WOLFSSL_dynlock_value* (*f)( const char*, int)) { WOLFSSL_STUB("CRYPTO_set_dynlock_create_callback"); (void)f; } +#endif - +#ifndef NO_WOLFSSL_STUB 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; } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_set_dynlock_destroy_callback( void (*f)(WOLFSSL_dynlock_value*, const char*, int)) { WOLFSSL_STUB("CRYPTO_set_set_dynlock_destroy_callback"); (void)f; } - +#endif const char* wolfSSL_X509_verify_cert_error_string(long err) @@ -17231,7 +17256,7 @@ const char* wolfSSL_X509_verify_cert_error_string(long err) } - +#ifndef NO_WOLFSSL_STUB int wolfSSL_X509_LOOKUP_add_dir(WOLFSSL_X509_LOOKUP* lookup, const char* dir, long len) { @@ -17241,8 +17266,9 @@ int wolfSSL_X509_LOOKUP_add_dir(WOLFSSL_X509_LOOKUP* lookup, const char* dir, WOLFSSL_STUB("X509_LOOKUP_add_dir"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup, const char* file, long type) { @@ -17333,14 +17359,16 @@ end: return WOLFSSL_FAILURE; #endif } +#endif - +#ifndef NO_WOLFSSL_STUB WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_hash_dir(void) { /* Method implementation in functions. */ static WOLFSSL_X509_LOOKUP_METHOD meth = { 1 }; return &meth; } +#endif WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_file(void) { @@ -18013,7 +18041,7 @@ int wolfSSL_X509_STORE_set_default_paths(WOLFSSL_X509_STORE* store) return WOLFSSL_SUCCESS; } - +#ifndef NO_WOLFSSL_STUB int wolfSSL_X509_STORE_get_by_subject(WOLFSSL_X509_STORE_CTX* ctx, int idx, WOLFSSL_X509_NAME* name, WOLFSSL_X509_OBJECT* obj) { @@ -18024,7 +18052,7 @@ int wolfSSL_X509_STORE_get_by_subject(WOLFSSL_X509_STORE_CTX* ctx, int idx, WOLFSSL_STUB("X509_STORE_get_by_subject"); return 0; } - +#endif WOLFSSL_X509_STORE_CTX* wolfSSL_X509_STORE_CTX_new(void) { @@ -18113,25 +18141,25 @@ int wolfSSL_X509_verify_cert(WOLFSSL_X509_STORE_CTX* ctx) } #endif /* NO_CERTS */ - +#ifndef NO_WOLFSSL_STUB WOLFSSL_ASN1_TIME* wolfSSL_X509_CRL_get_lastUpdate(WOLFSSL_X509_CRL* crl) { (void)crl; WOLFSSL_STUB("X509_CRL_get_lastUpdate"); return 0; } - - +#endif +#ifndef NO_WOLFSSL_STUB WOLFSSL_ASN1_TIME* wolfSSL_X509_CRL_get_nextUpdate(WOLFSSL_X509_CRL* crl) { (void)crl; WOLFSSL_STUB("X509_CRL_get_nextUpdate"); return 0; } +#endif - - +#ifndef NO_WOLFSSL_STUB int wolfSSL_X509_CRL_verify(WOLFSSL_X509_CRL* crl, WOLFSSL_EVP_PKEY* key) { (void)crl; @@ -18139,14 +18167,16 @@ int wolfSSL_X509_CRL_verify(WOLFSSL_X509_CRL* crl, WOLFSSL_EVP_PKEY* key) WOLFSSL_STUB("X509_CRL_verify"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB 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"); } +#endif #ifdef OPENSSL_EXTRA void wolfSSL_X509_STORE_CTX_set_time(WOLFSSL_X509_STORE_CTX* ctx, @@ -18163,11 +18193,13 @@ void wolfSSL_X509_STORE_CTX_set_time(WOLFSSL_X509_STORE_CTX* ctx, } #endif +#ifndef NO_WOLFSSL_STUB void wolfSSL_X509_OBJECT_free_contents(WOLFSSL_X509_OBJECT* obj) { (void)obj; WOLFSSL_STUB("X509_OBJECT_free_contents"); } +#endif WOLFSSL_EVP_PKEY* wolfSSL_PKEY_new(){ @@ -18239,32 +18271,34 @@ void wolfSSL_EVP_PKEY_free(WOLFSSL_EVP_PKEY* key) } } - +#ifndef NO_WOLFSSL_STUB int wolfSSL_X509_cmp_current_time(const WOLFSSL_ASN1_TIME* asnTime) { (void)asnTime; WOLFSSL_STUB("X509_cmp_current_time"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_sk_X509_REVOKED_num(WOLFSSL_X509_REVOKED* revoked) { (void)revoked; WOLFSSL_STUB("sk_X509_REVOKED_num"); return 0; } +#endif - - +#ifndef NO_WOLFSSL_STUB WOLFSSL_X509_REVOKED* wolfSSL_X509_CRL_get_REVOKED(WOLFSSL_X509_CRL* crl) { (void)crl; WOLFSSL_STUB("X509_CRL_get_REVOKED"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB WOLFSSL_X509_REVOKED* wolfSSL_sk_X509_REVOKED_value( WOLFSSL_X509_REVOKED* revoked, int value) { @@ -18273,7 +18307,7 @@ WOLFSSL_X509_REVOKED* wolfSSL_sk_X509_REVOKED_value( WOLFSSL_STUB("sk_X509_REVOKED_value"); return 0; } - +#endif WOLFSSL_ASN1_INTEGER* wolfSSL_X509_get_serialNumber(WOLFSSL_X509* x509) @@ -18449,6 +18483,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_adj(WOLFSSL_ASN1_TIME *s, time_t t, #endif /* OPENSSL_EXTRA && !NO_ASN_TIME && !USER_TIME */ /* && !TIME_OVERRIDES && !NO_FILESYSTEM */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER* a, const WOLFSSL_ASN1_INTEGER* b) { @@ -18457,14 +18492,16 @@ int wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER* a, WOLFSSL_STUB("ASN1_INTEGER_cmp"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER* i) { (void)i; WOLFSSL_STUB("ASN1_INTEGER_get"); return 0; } +#endif void* wolfSSL_X509_STORE_CTX_get_ex_data(WOLFSSL_X509_STORE_CTX* ctx, int idx) @@ -18480,15 +18517,16 @@ void* wolfSSL_X509_STORE_CTX_get_ex_data(WOLFSSL_X509_STORE_CTX* ctx, int idx) return 0; } - +#ifndef NO_WOLFSSL_STUB int wolfSSL_get_ex_data_X509_STORE_CTX_idx(void) { WOLFSSL_ENTER("SSL_get_ex_data_X509_STORE_CTX_idx"); WOLFSSL_STUB("SSL_get_ex_data_X509_STORE_CTX_idx"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX* ctx, void (*f)(const WOLFSSL* ssl, int type, int val)) { @@ -18497,8 +18535,9 @@ void wolfSSL_CTX_set_info_callback(WOLFSSL_CTX* ctx, WOLFSSL_STUB("CTX_set_info_callback"); } +#endif - +#ifndef NO_WOLFSSL_STUB unsigned long wolfSSL_ERR_peek_error(void) { WOLFSSL_ENTER("wolfSSL_ERR_peek_error"); @@ -18509,8 +18548,9 @@ unsigned long wolfSSL_ERR_peek_error(void) return 0; #endif } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_ERR_GET_REASON(unsigned long err) { #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) @@ -18522,32 +18562,36 @@ int wolfSSL_ERR_GET_REASON(unsigned long err) WOLFSSL_STUB("ERR_GET_REASON"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB char* wolfSSL_alert_type_string_long(int alertID) { (void)alertID; WOLFSSL_STUB("SSL_aalert_type_string_long"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB char* wolfSSL_alert_desc_string_long(int alertID) { (void)alertID; WOLFSSL_STUB("SSL_alert_desc_string_long"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB char* wolfSSL_state_string_long(const WOLFSSL* ssl) { (void)ssl; WOLFSSL_STUB("SSL_state_string_long"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_def_callback(char* name, int num, int w, void* key) { (void)name; @@ -18557,6 +18601,7 @@ int wolfSSL_PEM_def_callback(char* name, int num, int w, void* key) WOLFSSL_STUB("PEM_def_callback"); return 0; } +#endif long wolfSSL_set_options(WOLFSSL* ssl, long op) { @@ -18672,21 +18717,24 @@ long wolfSSL_clear_options(WOLFSSL* ssl, long opt) } /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_clear_num_renegotiations(WOLFSSL *s) { (void)s; WOLFSSL_STUB("SSL_clear_num_renegotiations"); return 0; } +#endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_total_renegotiations(WOLFSSL *s) { (void)s; WOLFSSL_STUB("SSL_total_renegotiations"); return 0; } - +#endif #ifndef NO_DH long wolfSSL_set_tmp_dh(WOLFSSL *ssl, WOLFSSL_DH *dh) @@ -18752,6 +18800,7 @@ const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *sess, unsign #endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st) { (void)st; @@ -18759,6 +18808,7 @@ WOLFSSL_API int wolfSSL_sk_SSL_COMP_zero(WOLFSSL_STACK* st) //wolfSSL_set_options(ssl, SSL_OP_NO_COMPRESSION); return WOLFSSL_FAILURE; } +#endif #ifdef OPENSSL_EXTRA #ifdef HAVE_CERTIFICATE_STATUS_REQUEST @@ -18785,6 +18835,7 @@ long wolfSSL_set_tlsext_status_type(WOLFSSL *s, int type) #endif /* HAVE_CERTIFICATE_STATUS_REQUEST */ #endif /* OPENSSL_EXTRA */ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_get_tlsext_status_exts(WOLFSSL *s, void *arg) { (void)s; @@ -18792,8 +18843,10 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_exts(WOLFSSL *s, void *arg) WOLFSSL_STUB("wolfSSL_get_tlsext_status_exts"); return WOLFSSL_FAILURE; } +#endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_set_tlsext_status_exts(WOLFSSL *s, void *arg) { (void)s; @@ -18801,8 +18854,10 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_exts(WOLFSSL *s, void *arg) WOLFSSL_STUB("wolfSSL_set_tlsext_status_exts"); return WOLFSSL_FAILURE; } +#endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_get_tlsext_status_ids(WOLFSSL *s, void *arg) { (void)s; @@ -18810,8 +18865,10 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_ids(WOLFSSL *s, void *arg) WOLFSSL_STUB("wolfSSL_get_tlsext_status_ids"); return WOLFSSL_FAILURE; } +#endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API long wolfSSL_set_tlsext_status_ids(WOLFSSL *s, void *arg) { (void)s; @@ -18819,8 +18876,10 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_ids(WOLFSSL *s, void *arg) WOLFSSL_STUB("wolfSSL_set_tlsext_status_ids"); return WOLFSSL_FAILURE; } +#endif /*** TBD ***/ +#ifndef NO_WOLFSSL_STUB WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid, unsigned int sid_len) { (void)s; @@ -18829,7 +18888,9 @@ WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid WOLFSSL_STUB("SSL_SESSION_set1_id"); return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API int SSL_SESSION_set1_id_context(WOLFSSL_SESSION *s, const unsigned char *sid_ctx, unsigned int sid_ctx_len) { @@ -18839,7 +18900,9 @@ WOLFSSL_API int SSL_SESSION_set1_id_context(WOLFSSL_SESSION *s, const unsigned c WOLFSSL_STUB("SSL_SESSION_set1_id_context"); return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API void *X509_get0_tbs_sigalg(const WOLFSSL_X509 *x) { @@ -18847,7 +18910,9 @@ WOLFSSL_API void *X509_get0_tbs_sigalg(const WOLFSSL_X509 *x) WOLFSSL_STUB("X509_get0_tbs_sigalg"); return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API void X509_ALGOR_get0(WOLFSSL_ASN1_OBJECT **paobj, int *pptype, const void **ppval, const void *algor) { @@ -18857,7 +18922,9 @@ WOLFSSL_API void X509_ALGOR_get0(WOLFSSL_ASN1_OBJECT **paobj, int *pptype, const (void)algor; WOLFSSL_STUB("X509_ALGOR_get0"); } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API void *X509_get_X509_PUBKEY(void * x) { @@ -18865,7 +18932,9 @@ WOLFSSL_API void *X509_get_X509_PUBKEY(void * x) WOLFSSL_STUB("X509_get_X509_PUBKEY"); return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API int X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, const unsigned char **pk, int *ppklen, void **pa, WOLFSSL_EVP_PKEY *pub) { @@ -18877,7 +18946,9 @@ WOLFSSL_API int X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, const unsig WOLFSSL_STUB("X509_PUBKEY_get0_param"); return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_get_privatekey(const WOLFSSL *ssl) { @@ -18885,7 +18956,9 @@ WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_get_privatekey(const WOLFSSL *ssl) WOLFSSL_STUB("SSL_get_privatekey"); return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API int i2t_ASN1_OBJECT(char *buf, int buf_len, WOLFSSL_ASN1_OBJECT *a) { @@ -18895,8 +18968,10 @@ WOLFSSL_API int i2t_ASN1_OBJECT(char *buf, int buf_len, WOLFSSL_ASN1_OBJECT *a) WOLFSSL_STUB("i2t_ASN1_OBJECT"); return -1; } +#endif #ifdef WOLFSSL_HAPROXY +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API size_t SSL_get_finished(const WOLFSSL *s, void *buf, size_t count) { @@ -18906,7 +18981,9 @@ WOLFSSL_API size_t SSL_get_finished(const WOLFSSL *s, void *buf, size_t count) WOLFSSL_STUB("SSL_get_finished"); return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API size_t SSL_get_peer_finished(const WOLFSSL *s, void *buf, size_t count) { @@ -18916,8 +18993,10 @@ WOLFSSL_API size_t SSL_get_peer_finished(const WOLFSSL *s, void *buf, size_t cou WOLFSSL_STUB("SSL_get_peer_finished"); return WOLFSSL_FAILURE; } +#endif #endif /* WOLFSSL_HAPROXY */ +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API void SSL_CTX_set_tmp_dh_callback(WOLFSSL_CTX *ctx, WOLFSSL_DH *(*dh) (WOLFSSL *ssl, int is_export, int keylength)) { @@ -18925,14 +19004,18 @@ WOLFSSL_API void SSL_CTX_set_tmp_dh_callback(WOLFSSL_CTX *ctx, WOLFSSL_DH *(*dh) (void)dh; WOLFSSL_STUB("SSL_CTX_set_tmp_dh_callback"); } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API WOLF_STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void) { WOLFSSL_STUB("SSL_COMP_get_compression_methods"); return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p) { @@ -18940,8 +19023,10 @@ WOLFSSL_API int wolfSSL_sk_SSL_CIPHER_num(const void * p) WOLFSSL_STUB("wolfSSL_sk_SSL_CIPHER_num"); return -1; } +#endif #if !defined(NO_FILESYSTEM) +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_X509(FILE *fp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u) { @@ -18952,7 +19037,9 @@ WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_X509(FILE *fp, WOLFSSL_X509 **x, pem_ WOLFSSL_STUB("PEM_read_X509"); return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(FILE *fp, WOLFSSL_EVP_PKEY **x, pem_password_cb *cb, void *u) { @@ -18964,7 +19051,9 @@ WOLFSSL_API WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(FILE *fp, WOLFSSL_EVP_ return NULL; } #endif +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *file, const char *dir) { @@ -18974,7 +19063,9 @@ WOLFSSL_API int X509_STORE_load_locations(WOLFSSL_X509_STORE *ctx, const char *f WOLFSSL_STUB("X509_STORE_load_locations"); return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB /*** TBD ***/ WOLFSSL_API WOLFSSL_CIPHER* wolfSSL_sk_SSL_CIPHER_value(void *ciphers, int idx) { @@ -18983,6 +19074,7 @@ WOLFSSL_API WOLFSSL_CIPHER* wolfSSL_sk_SSL_CIPHER_value(void *ciphers, int idx) WOLFSSL_STUB("wolfSSL_sk_SSL_CIPHER_value"); return NULL; } +#endif WOLFSSL_API void ERR_load_SSL_strings(void) { @@ -18998,9 +19090,9 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char * *resp = s->ocspResp; return s->ocspRespSz; } +#endif -WOLFSSL_API long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, - unsigned char *resp, int len) +WOLFSSL_API long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *resp, int len) { if (s == NULL) return WOLFSSL_FAILURE; @@ -19010,7 +19102,6 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, return WOLFSSL_SUCCESS; } -#endif long wolfSSL_get_verify_result(const WOLFSSL *ssl) { @@ -19712,6 +19803,7 @@ void wolfSSL_AES_cfb128_encrypt(const unsigned char *in, unsigned char* out, } #endif /* NO_AES */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...) { (void)bio; @@ -19719,8 +19811,9 @@ int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...) WOLFSSL_STUB("BIO_printf"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_ASN1_UTCTIME_print(WOLFSSL_BIO* bio, const WOLFSSL_ASN1_UTCTIME* a) { (void)bio; @@ -19728,6 +19821,7 @@ int wolfSSL_ASN1_UTCTIME_print(WOLFSSL_BIO* bio, const WOLFSSL_ASN1_UTCTIME* a) WOLFSSL_STUB("ASN1_UTCTIME_print"); return 0; } +#endif /* Return the month as a string. * @@ -19771,14 +19865,16 @@ int wolfSSL_ASN1_GENERALIZEDTIME_print(WOLFSSL_BIO* bio, return 0; } +#ifndef NO_WOLFSSL_STUB int wolfSSL_sk_num(WOLFSSL_X509_REVOKED* rev) { (void)rev; WOLFSSL_STUB("OPENSSL_sk_num"); return 0; } +#endif - +#ifndef NO_WOLFSSL_STUB void* wolfSSL_sk_value(WOLFSSL_X509_REVOKED* rev, int i) { (void)rev; @@ -19786,9 +19882,10 @@ void* wolfSSL_sk_value(WOLFSSL_X509_REVOKED* rev, int i) WOLFSSL_STUB("OPENSSL_sk_value"); return 0; } - +#endif /* stunnel 4.28 needs */ +#ifndef NO_WOLFSSL_STUB void wolfSSL_CTX_sess_set_get_cb(WOLFSSL_CTX* ctx, WOLFSSL_SESSION*(*f)(WOLFSSL*, unsigned char*, int, int*)) { @@ -19799,8 +19896,9 @@ void wolfSSL_CTX_sess_set_get_cb(WOLFSSL_CTX* ctx, (void)f; #endif } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx, int (*f)(WOLFSSL*, WOLFSSL_SESSION*)) { @@ -19811,8 +19909,9 @@ void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx, (void)f; #endif } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*, WOLFSSL_SESSION*)) { @@ -19823,6 +19922,7 @@ void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*, (void)f; #endif } +#endif int wolfSSL_i2d_SSL_SESSION(WOLFSSL_SESSION* sess, unsigned char** p) { @@ -20582,6 +20682,7 @@ WOLFSSL_BIGNUM* wolfSSL_BN_bin2bn(const unsigned char* str, int len, /* return compliant with OpenSSL * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_mask_bits(WOLFSSL_BIGNUM* bn, int n) { (void)bn; @@ -20590,6 +20691,7 @@ int wolfSSL_mask_bits(WOLFSSL_BIGNUM* bn, int n) WOLFSSL_STUB("BN_mask_bits"); return SSL_FAILURE; } +#endif /* WOLFSSL_SUCCESS on ok */ @@ -20902,6 +21004,7 @@ int wolfSSL_BN_set_word(WOLFSSL_BIGNUM* bn, WOLFSSL_BN_ULONG w) /* return code compliant with OpenSSL : * number length in decimal if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_BN_dec2bn(WOLFSSL_BIGNUM** bn, const char* str) { (void)bn; @@ -20911,7 +21014,7 @@ int wolfSSL_BN_dec2bn(WOLFSSL_BIGNUM** bn, const char* str) WOLFSSL_STUB("BN_dec2bn"); return SSL_FAILURE; } - +#endif #if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) char *wolfSSL_BN_bn2dec(const WOLFSSL_BIGNUM *bn) @@ -21180,6 +21283,7 @@ WOLFSSL_BIGNUM *wolfSSL_BN_CTX_get(WOLFSSL_BN_CTX *ctx) return wolfSSL_BN_new(); } +#ifndef NO_WOLFSSL_STUB void wolfSSL_BN_CTX_start(WOLFSSL_BN_CTX *ctx) { (void)ctx; @@ -21188,6 +21292,7 @@ void wolfSSL_BN_CTX_start(WOLFSSL_BN_CTX *ctx) WOLFSSL_STUB("BN_CTX_start"); WOLFSSL_MSG("wolfSSL_BN_CTX_start TBD"); } +#endif WOLFSSL_BIGNUM *wolfSSL_BN_mod_inverse(WOLFSSL_BIGNUM *r, @@ -22172,7 +22277,8 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn, } -/* WOLFSSL_SUCCESS on ok */ +/* SSL_SUCCESS on ok */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_RSA_blinding_on(WOLFSSL_RSA* rsa, WOLFSSL_BN_CTX* bn) { (void)rsa; @@ -22182,6 +22288,7 @@ int wolfSSL_RSA_blinding_on(WOLFSSL_RSA* rsa, WOLFSSL_BN_CTX* bn) return WOLFSSL_SUCCESS; /* on by default */ } +#endif /* return compliant with OpenSSL * size of encrypted data if success , -1 if error @@ -23243,6 +23350,7 @@ int wolfSSL_EVP_PKEY_set1_RSA(WOLFSSL_EVP_PKEY *pkey, WOLFSSL_RSA *key) } #endif /* NO_RSA */ +#ifndef NO_WOLFSSL_STUB WOLFSSL_DSA* wolfSSL_EVP_PKEY_get1_DSA(WOLFSSL_EVP_PKEY* key) { (void)key; @@ -23250,8 +23358,9 @@ WOLFSSL_DSA* wolfSSL_EVP_PKEY_get1_DSA(WOLFSSL_EVP_PKEY* key) WOLFSSL_STUB("EVP_PKEY_get1_DSA"); return NULL; } +#endif - +#ifndef NO_WOLFSSL_STUB WOLFSSL_EC_KEY* wolfSSL_EVP_PKEY_get1_EC_KEY(WOLFSSL_EVP_PKEY* key) { (void)key; @@ -23260,7 +23369,7 @@ WOLFSSL_EC_KEY* wolfSSL_EVP_PKEY_get1_EC_KEY(WOLFSSL_EVP_PKEY* key) return NULL; } - +#endif void* wolfSSL_EVP_X_STATE(const WOLFSSL_EVP_CIPHER_CTX* ctx) { @@ -23347,14 +23456,14 @@ void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset, #endif /* NO_AES */ - +#ifndef NO_WOLFSSL_STUB const WOLFSSL_EVP_MD* wolfSSL_EVP_ripemd160(void) { WOLFSSL_MSG("wolfSSL_ripemd160"); WOLFSSL_STUB("EVP_ripemd160"); return NULL; } - +#endif int wolfSSL_EVP_MD_size(const WOLFSSL_EVP_MD* type) { @@ -24210,6 +24319,7 @@ void wolfSSL_EC_KEY_free(WOLFSSL_EC_KEY *key) } } +#ifndef NO_WOLFSSL_STUB int wolfSSL_EC_KEY_set_group(WOLFSSL_EC_KEY *key, WOLFSSL_EC_GROUP *group) { (void)key; @@ -24220,6 +24330,7 @@ int wolfSSL_EC_KEY_set_group(WOLFSSL_EC_KEY *key, WOLFSSL_EC_GROUP *group) return -1; } +#endif int wolfSSL_EC_KEY_generate_key(WOLFSSL_EC_KEY *key) { @@ -24288,6 +24399,7 @@ int wolfSSL_EC_KEY_generate_key(WOLFSSL_EC_KEY *key) return 1; } +#ifndef NO_WOLFSSL_STUB void wolfSSL_EC_KEY_set_asn1_flag(WOLFSSL_EC_KEY *key, int asn1_flag) { (void)key; @@ -24296,6 +24408,7 @@ void wolfSSL_EC_KEY_set_asn1_flag(WOLFSSL_EC_KEY *key, int asn1_flag) WOLFSSL_ENTER("wolfSSL_EC_KEY_set_asn1_flag"); WOLFSSL_STUB("EC_KEY_set_asn1_flag"); } +#endif /* return code compliant with OpenSSL : * 1 if success, 0 if error @@ -24417,6 +24530,7 @@ void wolfSSL_EC_GROUP_free(WOLFSSL_EC_GROUP *group) group = NULL; } +#ifndef NO_WOLFSSL_STUB void wolfSSL_EC_GROUP_set_asn1_flag(WOLFSSL_EC_GROUP *group, int flag) { (void)group; @@ -24425,6 +24539,7 @@ void wolfSSL_EC_GROUP_set_asn1_flag(WOLFSSL_EC_GROUP *group, int flag) WOLFSSL_ENTER("wolfSSL_EC_GROUP_set_asn1_flag"); WOLFSSL_STUB("EC_GROUP_set_asn1_flag"); } +#endif WOLFSSL_EC_GROUP *wolfSSL_EC_GROUP_new_by_curve_name(int nid) { @@ -25067,6 +25182,7 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen, /* return code compliant with OpenSSL : * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) { (void)fp; @@ -25076,6 +25192,8 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) return WOLFSSL_FAILURE; } +#endif + #endif /* NO_FILESYSTEM */ #if defined(WOLFSSL_KEY_GEN) @@ -25083,6 +25201,7 @@ int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *x) /* return code compliant with OpenSSL : * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ecc, const EVP_CIPHER* cipher, unsigned char* passwd, int len, @@ -25100,6 +25219,7 @@ int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ecc, return WOLFSSL_FAILURE; } +#endif /* return code compliant with OpenSSL : * 1 if success, 0 if error @@ -25427,6 +25547,7 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa, /* return code compliant with OpenSSL : * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x) { (void)fp; @@ -25436,6 +25557,7 @@ int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x) return WOLFSSL_FAILURE; } +#endif #endif /* NO_FILESYSTEM */ #endif /* #ifndef NO_DSA */ @@ -25595,6 +25717,7 @@ WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, #ifndef NO_RSA #if !defined(NO_FILESYSTEM) +#ifndef NO_WOLFSSL_STUB WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x, pem_password_cb *cb, void *u) { @@ -25607,10 +25730,11 @@ WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x, return NULL; } - +#endif /* return code compliant with OpenSSL : * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x) { (void)fp; @@ -25620,10 +25744,12 @@ int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x) return WOLFSSL_FAILURE; } +#endif /* return code compliant with OpenSSL : * 1 if success, 0 if error */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x) { (void)fp; @@ -25633,6 +25759,8 @@ int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x) return WOLFSSL_FAILURE; } +#endif + #endif /* NO_FILESYSTEM */ /* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */ @@ -27278,6 +27406,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(HAVE_POCO_LIB) \ || defined(WOLFSSL_HAPROXY) +#ifndef NO_WOLFSSL_STUB unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md) { (void) *d; (void) n; (void) *md; @@ -27286,6 +27415,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return NULL; } +#endif char wolfSSL_CTX_use_certificate(WOLFSSL_CTX *ctx, WOLFSSL_X509 *x) { @@ -27329,6 +27459,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return WOLFSSL_SUCCESS; } + #ifndef NO_WOLFSSL_STUB int wolfSSL_BIO_read_filename(WOLFSSL_BIO *b, const char *name) { #ifndef NO_FILESYSTEM XFILE fp; @@ -27357,6 +27488,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return WOLFSSL_NOT_IMPLEMENTED; #endif } + #endif #ifdef HAVE_ECC const char * wolfSSL_OBJ_nid2sn(int n) { @@ -27391,6 +27523,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) } #endif /* HAVE_ECC */ +#ifndef NO_WOLFSSL_STUB int wolfSSL_OBJ_obj2nid(const WOLFSSL_ASN1_OBJECT *o) { (void)o; WOLFSSL_ENTER("wolfSSL_OBJ_obj2nid"); @@ -27398,7 +27531,9 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return 0; } +#endif +#ifndef NO_WOLFSSL_STUB char * wolfSSL_OBJ_nid2ln(int n) { (void)n; @@ -27407,7 +27542,9 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB int wolfSSL_OBJ_txt2nid(const char* s) { (void)s; @@ -27415,6 +27552,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return 0; } +#endif /* compatibility function. It's intended use is to remove OID's from an @@ -27437,6 +27575,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) #endif } + #ifndef NO_WOLFSSL_STUB void wolfSSL_set_verify_depth(WOLFSSL *ssl, int depth) { WOLFSSL_ENTER("wolfSSL_set_verify_depth"); #ifndef OPENSSL_EXTRA @@ -27447,6 +27586,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) ssl->options.verifyDepth = (byte)depth; #endif } + #endif void* wolfSSL_get_app_data( const WOLFSSL *ssl) { /* checkout exdata stuff... */ @@ -27457,6 +27597,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return wolfSSL_set_ex_data(ssl,0,(char *)arg); } + #ifndef NO_WOLFSSL_STUB WOLFSSL_ASN1_OBJECT * wolfSSL_X509_NAME_ENTRY_get_object(WOLFSSL_X509_NAME_ENTRY *ne) { (void)ne; WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_get_object"); @@ -27464,6 +27605,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return NULL; } + #endif WOLFSSL_X509_NAME_ENTRY *wolfSSL_X509_NAME_get_entry( WOLFSSL_X509_NAME *name, int loc) { @@ -27497,13 +27639,15 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return NULL; } + #ifndef NO_WOLFSSL_STUB void wolfSSL_sk_X509_NAME_pop_free(WOLF_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("sk_X509_NAME_pop_free"); } - + #endif + #ifndef NO_WOLFSSL_STUB int wolfSSL_X509_check_private_key(WOLFSSL_X509 *x509, WOLFSSL_EVP_PKEY *key){ (void) x509; (void) key; @@ -27520,6 +27664,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) return NULL; } + #endif #endif /* HAVE_LIGHTY || WOLFSSL_MYSQL_COMPATIBLE || HAVE_STUNNEL || WOLFSSL_NGINX || HAVE_POCO_LIB || WOLFSSL_HAPROXY */ #endif /* OPENSSL_EXTRA */ @@ -28253,7 +28398,7 @@ void* wolfSSL_SESSION_get_ex_data(const WOLFSSL_SESSION* session, int idx) return NULL; } - +#ifndef NO_WOLFSSL_STUB int wolfSSL_CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int), void *(*r) (void *, size_t, const char *, int), void (*f) (void *)) @@ -28266,11 +28411,13 @@ int wolfSSL_CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int), return WOLFSSL_FAILURE; } +#endif void wolfSSL_CRYPTO_cleanup_all_ex_data(void){ WOLFSSL_ENTER("CRYPTO_cleanup_all_ex_data"); } +#ifndef NO_WOLFSSL_STUB WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator, void (*callback) (int, int, void *), void *cb_arg) { @@ -28283,7 +28430,9 @@ WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator, return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB int wolfSSL_DH_generate_parameters_ex(WOLFSSL_DH* dh, int prime_len, int generator, void (*callback) (int, int, void *)) { @@ -28296,16 +28445,18 @@ int wolfSSL_DH_generate_parameters_ex(WOLFSSL_DH* dh, int prime_len, int generat return -1; } +#endif - +#ifndef NO_WOLFSSL_STUB void wolfSSL_ERR_load_crypto_strings(void) { WOLFSSL_ENTER("wolfSSL_ERR_load_crypto_strings"); WOLFSSL_STUB("wolfSSL_ERR_load_crypto_strings"); return; } +#endif - +#ifndef NO_WOLFSSL_STUB unsigned long wolfSSL_ERR_peek_last_error(void) { WOLFSSL_ENTER("wolfSSL_ERR_peek_last_error"); @@ -28326,8 +28477,8 @@ unsigned long wolfSSL_ERR_peek_last_error(void) return (unsigned long)(0 - NOT_COMPILED_IN); #endif } - - +#endif +#ifndef NO_WOLFSSL_STUB int wolfSSL_FIPS_mode(void) { WOLFSSL_ENTER("wolfSSL_FIPS_mode"); @@ -28335,7 +28486,9 @@ int wolfSSL_FIPS_mode(void) return WOLFSSL_FAILURE; } +#endif +#ifndef NO_WOLFSSL_STUB int wolfSSL_FIPS_mode_set(int r) { (void)r; @@ -28344,8 +28497,9 @@ int wolfSSL_FIPS_mode_set(int r) return WOLFSSL_FAILURE; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_RAND_set_rand_method(const void *meth) { (void) meth; @@ -28356,7 +28510,7 @@ int wolfSSL_RAND_set_rand_method(const void *meth) * those two functions will call the respective functions from meth */ return SSL_FAILURE; } - +#endif int wolfSSL_CIPHER_get_bits(const WOLFSSL_CIPHER *c, int *alg_bits) { @@ -28415,7 +28569,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name, return WOLFSSL_SUCCESS; } - +#ifndef NO_WOLFSSL_STUB WOLFSSL_ASN1_BIT_STRING* wolfSSL_X509_get0_pubkey_bitstr(const WOLFSSL_X509* x) { (void)x; @@ -28424,8 +28578,9 @@ WOLFSSL_ASN1_BIT_STRING* wolfSSL_X509_get0_pubkey_bitstr(const WOLFSSL_X509* x) return NULL; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_CTX_add_session(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* session) { (void)ctx; @@ -28435,8 +28590,9 @@ int wolfSSL_CTX_add_session(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* session) return WOLFSSL_SUCCESS; } +#endif - +#ifndef NO_WOLFSSL_STUB int wolfSSL_get_state(const WOLFSSL* ssl) { (void)ssl; @@ -28445,6 +28601,7 @@ int wolfSSL_get_state(const WOLFSSL* ssl) return WOLFSSL_FAILURE; } +#endif void* wolfSSL_sk_X509_NAME_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk, int i) @@ -28472,7 +28629,6 @@ void* wolfSSL_sk_X509_value(WOLF_STACK_OF(WOLFSSL_X509)* sk, int i) return sk->data.x509; } - int wolfSSL_version(WOLFSSL* ssl) { WOLFSSL_ENTER("wolfSSL_version"); @@ -28587,6 +28743,7 @@ void wolfSSL_ERR_load_BIO_strings(void) { /* do nothing */ } +#ifndef NO_WOLFSSL_STUB void wolfSSL_THREADID_set_callback(void(*threadid_func)(void*)) { WOLFSSL_ENTER("wolfSSL_THREADID_set_callback"); @@ -28594,7 +28751,9 @@ void wolfSSL_THREADID_set_callback(void(*threadid_func)(void*)) (void)threadid_func; return; } +#endif +#ifndef NO_WOLFSSL_STUB void wolfSSL_THREADID_set_numeric(void* id, unsigned long val) { WOLFSSL_ENTER("wolfSSL_THREADID_set_numeric"); @@ -28603,8 +28762,10 @@ void wolfSSL_THREADID_set_numeric(void* id, unsigned long val) (void)val; return; } +#endif +#ifndef NO_WOLFSSL_STUB WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ctx, WOLFSSL_X509_NAME* name) { @@ -28614,13 +28775,16 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CT (void)name; return NULL; } +#endif +#ifndef NO_WOLFSSL_STUB void wolfSSL_sk_X509_pop_free(WOLF_STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)){ (void) sk; (void) f; WOLFSSL_ENTER("wolfSSL_sk_X509_pop_free"); WOLFSSL_STUB("sk_X509_pop_free"); } +#endif #endif /* OPENSSL_EXTRA and HAVE_STUNNEL */ #if defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX))\