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

add ctx == NULL checks, fix spacing

Browse Source
This commit is contained in:
Takashi Kojo
2017-11-28 10:16:24 +09:00
parent 8f31d36bcd
commit 64caf325f8
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl.c
View File

@@ -11471,14 +11471,17 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
{ {
WOLFSSL_ENTER("wolfSSL_CTX_get_options"); WOLFSSL_ENTER("wolfSSL_CTX_get_options");
WOLFSSL_MSG("wolfSSL options are set through API calls and macros"); WOLFSSL_MSG("wolfSSL options are set through API calls and macros");
if(ctx == NULL)return SSL_FAILURE;
return ctx->mask; return ctx->mask;
} }
long wolfSSL_CTX_set_options(WOLFSSL_CTX* ctx, long opt) long wolfSSL_CTX_set_options(WOLFSSL_CTX* ctx, long opt)
{ {
WOLFSSL *ssl = wolfSSL_new(ctx); WOLFSSL *ssl;
WOLFSSL_ENTER("SSL_CTX_set_options"); WOLFSSL_ENTER("SSL_CTX_set_options");
if(ctx == NULL)return SSL_FAILURE;
ssl = wolfSSL_new(ctx);
if(ssl == NULL)return SSL_FAILURE; if(ssl == NULL)return SSL_FAILURE;
ctx->mask = wolfSSL_set_options(ssl, opt); ctx->mask = wolfSSL_set_options(ssl, opt);
wolfSSL_free(ssl); wolfSSL_free(ssl);
@@ -11583,6 +11586,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
void wolfSSL_X509_STORE_CTX_set_verify_cb(WOLFSSL_X509_STORE_CTX *ctx, void wolfSSL_X509_STORE_CTX_set_verify_cb(WOLFSSL_X509_STORE_CTX *ctx,
WOLFSSL_X509_STORE_CTX_verify_cb verify_cb) WOLFSSL_X509_STORE_CTX_verify_cb verify_cb)
{ {
WOLFSSL_ENTER("wolfSSL_X509_STORE_CTX_set_verify_cb");
if(ctx == NULL)return;
ctx->verify_cb = verify_cb; ctx->verify_cb = verify_cb;
} }
#endif #endif
@@ -17076,7 +17081,7 @@ long wolfSSL_set_options(WOLFSSL* ssl, long op)
long wolfSSL_get_options(const WOLFSSL* ssl) long wolfSSL_get_options(const WOLFSSL* ssl)
{ {
WOLFSSL_ENTER("wolfSSL_get_options"); WOLFSSL_ENTER("wolfSSL_get_options");
if(ssl == NULL)return WOLFSSL_FAILURE;
return ssl->options.mask; return ssl->options.mask;
} }
@@ -26444,6 +26449,8 @@ void *wolfSSL_OPENSSL_memdup(const void *data, size_t siz, const char* file, int
int wolfSSL_CTX_set_alpn_protos(WOLFSSL_CTX *ctx, const unsigned char *p, int wolfSSL_CTX_set_alpn_protos(WOLFSSL_CTX *ctx, const unsigned char *p,
unsigned int p_len) unsigned int p_len)
{ {
WOLFSSL_ENTER("wolfSSL_CTX_set_alpn_protos");
if(ctx == NULL)return WOLFSSL_FAILURE;
if((void *)ctx->alpn_cli_protos != NULL) if((void *)ctx->alpn_cli_protos != NULL)
wolfSSL_OPENSSL_free((void *)ctx->alpn_cli_protos); wolfSSL_OPENSSL_free((void *)ctx->alpn_cli_protos);
ctx->alpn_cli_protos = ctx->alpn_cli_protos =

12
tests/api.c
View File

@@ -10517,10 +10517,10 @@ static void test_wolfSSL_set_options(void)
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS)
static int verify_cb(int ok, X509_STORE_CTX *ctx) static int verify_cb(int ok, X509_STORE_CTX *ctx)
{ {
(void) ok; (void) ok;
(void) ctx; (void) ctx;
printf("ENTER verify_cb\n"); printf("ENTER verify_cb\n");
return SSL_SUCCESS; return SSL_SUCCESS;
} }
#endif #endif
@@ -10530,8 +10530,8 @@ static void test_wolfSSL_X509_STORE_CTX(void)
X509_STORE_CTX *ctx = NULL ; X509_STORE_CTX *ctx = NULL ;
printf(testingFmt, "test_wolfSSL_X509_STORE_CTX(()"); printf(testingFmt, "test_wolfSSL_X509_STORE_CTX(()");
AssertNotNull(ctx = X509_STORE_CTX_new()); AssertNotNull(ctx = X509_STORE_CTX_new());
X509_STORE_CTX_set_verify_cb(ctx, (void *)verify_cb); X509_STORE_CTX_set_verify_cb(ctx, (void *)verify_cb);
X509_STORE_CTX_free(ctx); X509_STORE_CTX_free(ctx);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif