feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Refined NO_WOLFSSL_STUB

Browse Source
This commit is contained in:
Takashi Kojo
2017-04-04 09:50:08 +09:00
committed by Jacob Barthelmeh
parent f49e58a169
commit d7e844d7a2
2 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ssl.c
View File

@@ -14224,7 +14224,6 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
/* nothing to do here */ /* nothing to do here */
} }
#ifndef NO_WOLFSSL_STUB
int wolfSSL_clear(WOLFSSL* ssl) int wolfSSL_clear(WOLFSSL* ssl)
{ {
if (ssl == NULL) { if (ssl == NULL) {
@@ -14277,7 +14276,6 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif
long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t) long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t)
{ {
@@ -14349,7 +14347,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
const unsigned char* sid_ctx, const unsigned char* sid_ctx,
unsigned int sid_ctx_len) unsigned int sid_ctx_len)
{ {
WOLFSSL_STUB("SSL_CTX_set_session_id_context"); WOLFSSL_ENTER("SSL_CTX_set_session_id_context");
/* No application specific context needed for wolfSSL */ /* No application specific context needed for wolfSSL */
if (sid_ctx_len > ID_LEN || ctx == NULL || sid_ctx == NULL) { if (sid_ctx_len > ID_LEN || ctx == NULL || sid_ctx == NULL) {
@@ -17164,7 +17162,6 @@ int wolfSSL_X509_LOOKUP_add_dir(WOLFSSL_X509_LOOKUP* lookup, const char* dir,
} }
#endif #endif
#ifndef NO_WOLFSSL_STUB
int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup, int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup,
const char* file, long type) const char* file, long type)
{ {
@@ -17255,16 +17252,13 @@ end:
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#endif #endif
} }
#endif
#ifndef NO_WOLFSSL_STUB
WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_hash_dir(void) WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_hash_dir(void)
{ {
/* Method implementation in functions. */ /* Method implementation in functions. */
static WOLFSSL_X509_LOOKUP_METHOD meth = { 1 }; static WOLFSSL_X509_LOOKUP_METHOD meth = { 1 };
return &meth; return &meth;
} }
#endif
WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_file(void) WOLFSSL_X509_LOOKUP_METHOD* wolfSSL_X509_LOOKUP_file(void)
{ {
@@ -19005,7 +18999,6 @@ WOLFSSL_API long wolfSSL_get_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *
*resp = s->ocspResp; *resp = s->ocspResp;
return s->ocspRespSz; 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)
{ {
@@ -19017,6 +19010,7 @@ WOLFSSL_API long wolfSSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* HAVE_OCSP */
long wolfSSL_get_verify_result(const WOLFSSL *ssl) long wolfSSL_get_verify_result(const WOLFSSL *ssl)
{ {
@@ -19804,7 +19798,6 @@ void* wolfSSL_sk_value(WOLFSSL_X509_REVOKED* rev, int i)
#endif #endif
/* stunnel 4.28 needs */ /* stunnel 4.28 needs */
#ifndef NO_WOLFSSL_STUB
void wolfSSL_CTX_sess_set_get_cb(WOLFSSL_CTX* ctx, void wolfSSL_CTX_sess_set_get_cb(WOLFSSL_CTX* ctx,
WOLFSSL_SESSION*(*f)(WOLFSSL*, unsigned char*, int, int*)) WOLFSSL_SESSION*(*f)(WOLFSSL*, unsigned char*, int, int*))
{ {
@@ -19815,9 +19808,7 @@ void wolfSSL_CTX_sess_set_get_cb(WOLFSSL_CTX* ctx,
(void)f; (void)f;
#endif #endif
} }
#endif
#ifndef NO_WOLFSSL_STUB
void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx, void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx,
int (*f)(WOLFSSL*, WOLFSSL_SESSION*)) int (*f)(WOLFSSL*, WOLFSSL_SESSION*))
{ {
@@ -19828,9 +19819,7 @@ void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx,
(void)f; (void)f;
#endif #endif
} }
#endif
#ifndef NO_WOLFSSL_STUB
void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*, void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*,
WOLFSSL_SESSION*)) WOLFSSL_SESSION*))
{ {
@@ -19841,7 +19830,6 @@ void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*,
(void)f; (void)f;
#endif #endif
} }
#endif
/* /*
* *
@@ -27915,7 +27903,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
int wolfSSL_OBJ_obj2nid(const WOLFSSL_ASN1_OBJECT *o) { int wolfSSL_OBJ_obj2nid(const WOLFSSL_ASN1_OBJECT *o) {
(void)o; (void)o;
WOLFSSL_ENTER("wolfSSL_OBJ_obj2nid"); WOLFSSL_ENTER("wolfSSL_OBJ_obj2nid");
WOLFSSL_STUB("wolfSSL_OBJ_obj2nid"); WOLFSSL_STUB("OBJ_obj2nid");
return 0; return 0;
} }
@@ -27926,7 +27914,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
{ {
(void)n; (void)n;
WOLFSSL_ENTER("wolfSSL_OBJ_nid2ln"); WOLFSSL_ENTER("wolfSSL_OBJ_nid2ln");
WOLFSSL_STUB("wolfSSL_OBJ_nid2ln"); WOLFSSL_STUB("OBJ_nid2ln");
return NULL; return NULL;
} }
@@ -27936,13 +27924,12 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
int wolfSSL_OBJ_txt2nid(const char* s) int wolfSSL_OBJ_txt2nid(const char* s)
{ {
(void)s; (void)s;
WOLFSSL_STUB("wolfSSL_OBJ_txt2nid"); WOLFSSL_STUB("OBJ_txt2nid");
return 0; return 0;
} }
#endif #endif
/* compatibility function. It's intended use is to remove OID's from an /* compatibility function. It's intended use is to remove OID's from an
* internal table that have been added with OBJ_create. wolfSSL manages it's * internal table that have been added with OBJ_create. wolfSSL manages it's
* own interenal OID values and does not currently support OBJ_create. */ * own interenal OID values and does not currently support OBJ_create. */
@@ -28944,7 +28931,6 @@ int wolfSSL_sk_X509_num(const WOLF_STACK_OF(WOLFSSL_X509) *s)
return (int)s->num; return (int)s->num;
} }
int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name, int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
int indent, unsigned long flags) int indent, unsigned long flags)
{ {
@@ -29667,19 +29653,25 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line,
#if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)
#ifndef NO_WOLFSSL_STUB
WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl) WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl)
{ {
(void)ssl; (void)ssl;
WOLFSSL_STUB("wolfSSL_get_ciphers_compat"); WOLFSSL_STUB("wolfSSL_get_ciphers_compat");
return NULL; return NULL;
} }
#endif
#ifndef NO_WOLFSSL_STUB
void wolfSSL_OPENSSL_config(char *config_name) void wolfSSL_OPENSSL_config(char *config_name)
{ {
WOLFSSL_STUB("wolfSSL_OPENSSL_config");
(void)config_name; (void)config_name;
WOLFSSL_STUB("OPENSSL_config");
} }
#endif
#endif
#ifdef WOLFSSL_NGINX
int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a, void *b, void *c) int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a, void *b, void *c)
{ {
static int x509_idx = 0; static int x509_idx = 0;
@@ -30471,20 +30463,20 @@ int wolfSSL_set_msg_callback(WOLFSSL *ssl, SSL_Msg_Cb cb)
} }
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
void wolfSSL_CTX_set_msg_callback_arg(WOLFSSL_CTX *ctx, void* arg) int wolfSSL_CTX_set_msg_callback_arg(WOLFSSL_CTX *ctx, void* arg)
{ {
WOLFSSL_STUB("SSL_CTX_set_msg_callback_arg"); WOLFSSL_STUB("SSL_CTX_set_msg_callback_arg");
(void)ctx; (void)ctx;
(void)arg; (void)arg;
return; return WOLFSSL_FAILURE;
} }
#endif #endif
void wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg) int wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg)
{ {
WOLFSSL_ENTER("wolfSSL_set_msg_callback_arg"); WOLFSSL_ENTER("wolfSSL_set_msg_callback_arg");
ssl->protoMsgCtx = arg; ssl->protoMsgCtx = arg;
return; return WOLFSSL_SUCCESS;
} }
void *wolfSSL_OPENSSL_memdup(const void *data, size_t siz, const char* file, int line) void *wolfSSL_OPENSSL_memdup(const void *data, size_t siz, const char* file, int line)

18
wolfssl/ssl.h
View File

@@ -2564,7 +2564,7 @@ typedef int (*CallbackSniRecv)(WOLFSSL *ssl, int *ret, void* exArg);
WOLFSSL_API int wolfSSL_CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int), WOLFSSL_API 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 *)); void *(*r) (void *, size_t, const char *, int), void (*f) (void *));
WOLFSSL_API void wolfSSL_CRYPTO_cleanup_all_ex_data(void); WOLFSSL_API void wolfSSL_CRYPTO_cleanup_all_ex_data(void);
WOLFSSL_API WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator, WOLFSSL_API WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator,
@@ -2678,12 +2678,8 @@ typedef void (*SSL_Msg_Cb)(int write_p, int version, int content_type,
WOLFSSL_API int wolfSSL_CTX_set_msg_callback(WOLFSSL_CTX *ctx, SSL_Msg_Cb cb); WOLFSSL_API int wolfSSL_CTX_set_msg_callback(WOLFSSL_CTX *ctx, SSL_Msg_Cb cb);
WOLFSSL_API int wolfSSL_set_msg_callback(WOLFSSL *ssl, SSL_Msg_Cb cb); WOLFSSL_API int wolfSSL_set_msg_callback(WOLFSSL *ssl, SSL_Msg_Cb cb);
WOLFSSL_API void wolfSSL_CTX_set_msg_callback_arg(WOLFSSL_CTX *ctx, void* arg); WOLFSSL_API int wolfSSL_CTX_set_msg_callback_arg(WOLFSSL_CTX *ctx, void* arg);
WOLFSSL_API void wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg); WOLFSSL_API int wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg);
#endif
#ifdef OPENSSL_EXTRA
WOLFSSL_API unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, WOLFSSL_API unsigned long wolfSSL_ERR_peek_error_line_data(const char **file,
int *line, const char **data, int *flags); int *line, const char **data, int *flags);
WOLFSSL_API int wolfSSL_CTX_set_alpn_protos(WOLFSSL_CTX *ctx, WOLFSSL_API int wolfSSL_CTX_set_alpn_protos(WOLFSSL_CTX *ctx,
@@ -2693,7 +2689,12 @@ WOLFSSL_API void *wolfSSL_OPENSSL_memdup(const void *data,
WOLFSSL_API void wolfSSL_ERR_load_BIO_strings(void); WOLFSSL_API void wolfSSL_ERR_load_BIO_strings(void);
#endif #endif
#if defined WOLFSSL_NGINX || defined WOLFSSL_HAPROXY #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) || \
defined(OPENSSL_EXTRA)
WOLFSSL_API void wolfSSL_OPENSSL_config(char *config_name);
#endif
#if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)
/* Not an OpenSSL API. */ /* Not an OpenSSL API. */
WOLFSSL_LOCAL int wolfSSL_get_ocsp_response(WOLFSSL* ssl, byte** response); WOLFSSL_LOCAL int wolfSSL_get_ocsp_response(WOLFSSL* ssl, byte** response);
/* Not an OpenSSL API. */ /* Not an OpenSSL API. */
@@ -2702,7 +2703,6 @@ WOLFSSL_LOCAL char* wolfSSL_get_ocsp_url(WOLFSSL* ssl);
WOLFSSL_API int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url); WOLFSSL_API int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url);
WOLFSSL_API WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl); WOLFSSL_API WOLF_STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl);
WOLFSSL_API void wolfSSL_OPENSSL_config(char *config_name);
WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a, WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a,
void *b, void *c); void *b, void *c);
WOLFSSL_API void *wolfSSL_X509_get_ex_data(WOLFSSL_X509 *x509, int idx); WOLFSSL_API void *wolfSSL_X509_get_ex_data(WOLFSSL_X509 *x509, int idx);