Skip to content

Commit a1939d2

Browse files
committed
wolfBot fixes
Importing an EC point ordinate with one being zero will result in different errors based on different implementations. Check both known error codes. Benchmark usage fixed.
1 parent 048083c commit a1939d2

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

tests/api.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20965,15 +20965,17 @@ static int test_wc_ecc_import_raw(void)
2096520965
wc_ecc_free(&key);
2096620966
#endif
2096720967
#ifdef WOLFSSL_VALIDATE_ECC_IMPORT
20968-
ExpectIntEQ(wc_ecc_import_raw(&key, "0", qy, d, curveName), BAD_FUNC_ARG);
20968+
ExpectIntLT(ret = wc_ecc_import_raw(&key, "0", qy, d, curveName), 0);
20969+
ExpectTrue((ret == BAD_FUNC_ARG) || (ret == MP_VAL));
2096920970
#else
2097020971
ExpectIntEQ(wc_ecc_import_raw(&key, "0", qy, d, curveName), 0);
2097120972
#endif
2097220973
#if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
2097320974
wc_ecc_free(&key);
2097420975
#endif
2097520976
#ifdef WOLFSSL_VALIDATE_ECC_IMPORT
20976-
ExpectIntEQ(wc_ecc_import_raw(&key, qx, "0", d, curveName), BAD_FUNC_ARG);
20977+
ExpectIntLT(ret = wc_ecc_import_raw(&key, qx, "0", d, curveName), 0);
20978+
ExpectTrue((ret == BAD_FUNC_ARG) || (ret == MP_VAL));
2097720979
#else
2097820980
ExpectIntEQ(wc_ecc_import_raw(&key, qx, "0", d, curveName), 0);
2097920981
#endif

wolfcrypt/benchmark/benchmark.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,9 +892,9 @@ static int lng_index = 0;
892892

893893
#ifndef NO_MAIN_DRIVER
894894
#ifndef MAIN_NO_ARGS
895-
static const char* bench_Usage_msg1[][21] = {
895+
static const char* bench_Usage_msg1[][22] = {
896896
/* 0 English */
897-
{ "-? <num> Help, print this usage\n"
897+
{ "-? <num> Help, print this usage\n",
898898
" 0: English, 1: Japanese\n",
899899
"-csv Print terminal output in csv format\n",
900900
"-base10 Display bytes as power of 10 (eg 1 kB = 1000 Bytes)\n",
@@ -927,7 +927,7 @@ static const char* bench_Usage_msg1[][21] = {
927927
},
928928
#ifndef NO_MULTIBYTE_PRINT
929929
/* 1 Japanese */
930-
{ "-? <num> ヘルプ, 使い方を表示します。\n"
930+
{ "-? <num> ヘルプ, 使い方を表示します。\n",
931931
" 0: 英語、 1: 日本語\n",
932932
"-csv csv 形式で端末に出力します。\n",
933933
"-base10 バイトを10のべき乗で表示します。(例 1 kB = 1000 Bytes)\n",

0 commit comments

Comments
 (0)