mirror of https://github.com/wolfSSL/wolfssl
Fixes in test and example code
This commit is contained in:
parent
af5c98a6a8
commit
774a758f59
|
@ -1279,8 +1279,8 @@ int bench_tls(void* args)
|
|||
stats_t cli_comb, srv_comb;
|
||||
int i;
|
||||
char *cipher, *next_cipher, *ciphers = NULL;
|
||||
int argc = ((func_args*)args)->argc;
|
||||
char** argv = ((func_args*)args)->argv;
|
||||
int argc = 0;
|
||||
char** argv = NULL;
|
||||
int ch;
|
||||
|
||||
/* Vars configured by command line arguments */
|
||||
|
@ -1303,8 +1303,11 @@ int bench_tls(void* args)
|
|||
int listenFd = -1;
|
||||
#endif
|
||||
|
||||
if (args)
|
||||
if (args != NULL) {
|
||||
argc = ((func_args*)args)->argc;
|
||||
argv = ((func_args*)args)->argv;
|
||||
((func_args*)args)->return_code = -1; /* error state */
|
||||
}
|
||||
|
||||
/* Initialize wolfSSL */
|
||||
wolfSSL_Init();
|
||||
|
|
|
@ -231,7 +231,7 @@ static void ShowVersions(void)
|
|||
#ifdef WOLFSSL_TLS13
|
||||
static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519)
|
||||
{
|
||||
int groups[3];
|
||||
int groups[3] = {0};
|
||||
int count = 0;
|
||||
|
||||
(void)useX25519;
|
||||
|
|
10
tests/api.c
10
tests/api.c
|
@ -21752,14 +21752,14 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
|
|||
/* offset_sec = -45 * min;*/
|
||||
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
|
||||
AssertTrue(asn_time->type == asn_utc_time);
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str));
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1);
|
||||
AssertIntEQ(0, XMEMCMP(date_str, "000222211500Z", 13));
|
||||
|
||||
/* negative offset */
|
||||
offset_sec = -45 * mini;
|
||||
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
|
||||
AssertTrue(asn_time->type == asn_utc_time);
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str));
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1);
|
||||
AssertIntEQ(0, XMEMCMP(date_str, "000222194500Z", 13));
|
||||
|
||||
XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
|
@ -21776,7 +21776,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
|
|||
offset_sec = 10 * mini;
|
||||
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
|
||||
AssertTrue(asn_time->type == asn_gen_time);
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str));
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1);
|
||||
AssertIntEQ(0, XMEMCMP(date_str, "20550313091000Z", 15));
|
||||
|
||||
XFREE(s, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
|
@ -21791,13 +21791,13 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
|
|||
offset_sec = 45 * mini;
|
||||
asn_time = wolfSSL_ASN1_TIME_adj(s, t, offset_day, offset_sec);
|
||||
AssertTrue(asn_time->type == asn_utc_time);
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str));
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1);
|
||||
AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13));
|
||||
XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
|
||||
asn_time = wolfSSL_ASN1_TIME_adj(NULL, t, offset_day, offset_sec);
|
||||
AssertTrue(asn_time->type == asn_utc_time);
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str));
|
||||
XSTRNCPY(date_str, (const char*)&asn_time->data, sizeof(date_str)-1);
|
||||
AssertIntEQ(0, XMEMCMP(date_str, "000222211515Z", 13));
|
||||
XFREE(asn_time, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue