wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

addressed jenkins failures part1

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-04-23 11:09:09 +09:00
parent 33e91c577f
commit af67965f65
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ssl.c
View File

@@ -56226,6 +56226,8 @@ static int cmdfunc_curves(WOLFSSL_CONF_CTX* cctx, const char* value)
return ret; return ret;
} }
#endif #endif
#ifndef NO_FILESYSTEM
/** /**
* process cert command * process cert command
* @param cctx a pointer to WOLFSSL_CONF_CTX structure * @param cctx a pointer to WOLFSSL_CONF_CTX structure
@@ -56309,6 +56311,7 @@ static int cmdfunc_key(WOLFSSL_CONF_CTX* cctx, const char* value)
WOLFSSL_LEAVE("cmdfunc_key", ret); WOLFSSL_LEAVE("cmdfunc_key", ret);
return ret; return ret;
} }
#endif /* NO_FILESYSTEM */
/** /**
* process DH parameter command * process DH parameter command
* @param cctx a pointer to WOLFSSL_CONF_CTX structure * @param cctx a pointer to WOLFSSL_CONF_CTX structure
@@ -56357,12 +56360,11 @@ static int cmdfunc_dhparam(WOLFSSL_CONF_CTX* cctx, const char* value)
return 1; return 1;
if (cctx->ctx) { if (cctx->ctx) {
ret = wolfSSL_CTX_set_tmp_dh(cctx->ctx, dh); ret = (int)wolfSSL_CTX_set_tmp_dh(cctx->ctx, dh);
} }
if (cctx->ssl) { if (cctx->ssl) {
/* wolfSSL_use_set_tmp_dh not yet implemented */ ret = (int)wolfSSL_CTX_set_tmp_dh(cctx->ssl->ctx, dh);
ret = WOLFSSL_FAILURE;
} }
if (dh) if (dh)
@@ -56385,15 +56387,19 @@ typedef struct conf_cmd_tbl {
}conf_cmd_tbl; }conf_cmd_tbl;
static const conf_cmd_tbl conf_cmds_tbl[] = { static const conf_cmd_tbl conf_cmds_tbl[] = {
#if defined(HAVE_ECC)
/* cmd Curves */ /* cmd Curves */
{WOLFSSL_CONF_FILE_CMD1, WOLFSSL_CONF_CMDL_CMD1, {WOLFSSL_CONF_FILE_CMD1, WOLFSSL_CONF_CMDL_CMD1,
WOLFSSL_CONF_TYPE_STRING, cmdfunc_curves}, WOLFSSL_CONF_TYPE_STRING, cmdfunc_curves},
#endif
#if !defined(NO_FILESYSTEM)
/* cmd Certificate */ /* cmd Certificate */
{WOLFSSL_CONF_FILE_CMD2, WOLFSSL_CONF_CMDL_CMD2, {WOLFSSL_CONF_FILE_CMD2, WOLFSSL_CONF_CMDL_CMD2,
WOLFSSL_CONF_TYPE_FILE, cmdfunc_cert}, WOLFSSL_CONF_TYPE_FILE, cmdfunc_cert},
/* cmd PrivateKey */ /* cmd PrivateKey */
{WOLFSSL_CONF_FILE_CMD3, WOLFSSL_CONF_CMDL_CMD3, {WOLFSSL_CONF_FILE_CMD3, WOLFSSL_CONF_CMDL_CMD3,
WOLFSSL_CONF_TYPE_FILE, cmdfunc_key}, WOLFSSL_CONF_TYPE_FILE, cmdfunc_key},
#endif
/* cmd Protocol */ /* cmd Protocol */
{WOLFSSL_CONF_FILE_CMD4, WOLFSSL_CONF_CMDL_CMD4, {WOLFSSL_CONF_FILE_CMD4, WOLFSSL_CONF_CMDL_CMD4,
WOLFSSL_CONF_TYPE_STRING, NULL}, WOLFSSL_CONF_TYPE_STRING, NULL},
@@ -56414,13 +56420,13 @@ static const conf_cmd_tbl conf_cmds_tbl[] = {
WOLFSSL_CONF_TYPE_STRING, cmdfunc_cipherstring}, WOLFSSL_CONF_TYPE_STRING, cmdfunc_cipherstring},
#if !defined(NO_DH) && !defined(NO_BIO) #if !defined(NO_DH) && !defined(NO_BIO)
/* cmd DHParameters */ /* cmd DHParameters */
{WOLFSSL_CONF_FILE_CMD9, WOLFSSL_CONF_CMDL_CMD9, {WOLFSSL_CONF_FILE_CMD10, WOLFSSL_CONF_CMDL_CMD10,
WOLFSSL_CONF_TYPE_FILE, NULL}, WOLFSSL_CONF_TYPE_FILE, cmdfunc_dhparam},
#endif #endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* cmd ECHDParameters */ /* cmd ECHDParameters */
{WOLFSSL_CONF_FILE_CMD10, WOLFSSL_CONF_CMDL_CMD10, {WOLFSSL_CONF_FILE_CMD11, WOLFSSL_CONF_CMDL_CMD11,
WOLFSSL_CONF_TYPE_STRING, cmdfunc_dhparam}, WOLFSSL_CONF_TYPE_STRING, NULL},
#endif #endif
}; };
/* size of command table */ /* size of command table */

29
tests/api.c
View File

@@ -43095,17 +43095,9 @@ static void test_CONF_CTX_CMDLINE(void)
AssertNotNull(cctx = SSL_CONF_CTX_new()); AssertNotNull(cctx = SSL_CONF_CTX_new());
#ifndef NO_OLD_TLS AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
#ifdef WOLFSSL_ALLOW_SSLV3 SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
#ifdef NO_WOLFSSL_SERVER AssertTrue(1);
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
#else
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
#endif
SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
AssertTrue(1);
#endif
#endif
/* set flags */ /* set flags */
AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_CMDLINE), AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_CMDLINE),
@@ -43183,18 +43175,9 @@ static void test_CONF_CTX_FILE(void)
SSL_CONF_CTX* cctx = NULL; SSL_CONF_CTX* cctx = NULL;
AssertNotNull(cctx = SSL_CONF_CTX_new()); AssertNotNull(cctx = SSL_CONF_CTX_new());
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
#ifndef NO_OLD_TLS SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
#ifdef WOLFSSL_ALLOW_SSLV3 AssertTrue(1);
#ifdef NO_WOLFSSL_SERVER
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
#else
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
#endif
SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
AssertTrue(1);
#endif
#endif
/* set flags */ /* set flags */
AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_FILE), AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_FILE),