WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1936 from kojo1/multi-byte 

NO_MULTIBYTE option
pull/1948/head
Chris Conlon 2018-11-29 13:16:10 -08:00 committed by GitHub
parent bea93e9159 bbea4aba59
commit 2c48553a29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IDE/IAR-EWARM/Projects/user_settings.h
View File

@ -10,6 +10,7 @@
#define NO_WOLFSSL_DIR
#define WOLFSSL_NO_CURRDIR
#define NO_WOLF_C99
#define NO_MULTIBYTE_PRINT
#define XVALIDATEDATE(d, f,t) (0)
#define WOLFSSL_USER_CURRTIME /* for benchmark */

1
IDE/MDK5-ARM/Conf/user_settings.h
View File

@ -35,6 +35,7 @@
#define WOLFSSL_CURRTIME_OSTICK /* use OS tich for current_time */
#define WOLFSSL_GMTIME
#define NO_MULTIBYTE_PRINT
// <<< Use Configuration Wizard in Context Menu >>>

2
IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h
View File

@ -34,10 +34,10 @@
#define WOLFSSL_USER_CURRTIME /* for benchmark */
#define WOLFSSL_CURRTIME_OSTICK /* use OS tich for current_time */
#define WOLFSSL_GMTIME
#define NO_MULTIBYTE_PRINT
// <<< Use Configuration Wizard in Context Menu >>>
// <h>Common options
// <o> MPU<0=>Undefined<1=>STM32F2xx<2=>STM32F4xx<3=>STM32F7xx
#define MDK_CONF_MPU 3

1
IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h
View File

@ -34,6 +34,7 @@
#define WOLFSSL_USER_CURRTIME /* for benchmark */
#define WOLFSSL_CURRTIME_OSTICK /* use OS tich for current_time */
#define WOLFSSL_GMTIME
#define NO_MULTIBYTE_PRINT
// <<< Use Configuration Wizard in Context Menu >>>

4
examples/client/client.c
View File

@ -258,11 +258,13 @@ static const char* client_bench_conmsg[][5] = {
"wolfSSL_connect avg took:", "milliseconds\n",
NULL
},
#ifndef NO_MULTIBYTE_PRINT
/* Japanese */
{
"wolfSSL_resume 平均時間:", "ミリ秒\n",
"wolfSSL_connect 平均時間:", "ミリ秒\n",
}
#endif
};
static int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port,
@ -940,6 +942,7 @@ static const char* client_usage_msg[][59] = {
" 0: English, 1: Japanese\n", /* 58 */
NULL,
},
#ifndef NO_MULTIBYTE_PRINT
/* Japanese */
{
" 注意 : 全てのファイルは wolfSSL ホーム・ディレクトリからの相対です。"
@ -1090,6 +1093,7 @@ static const char* client_usage_msg[][59] = {
" 0: 英語、 1: 日本語\n", /* 58 */
NULL,
},
#endif
};

2
examples/server/server.c
View File

@ -456,6 +456,7 @@ static const char* server_usage_msg[][49] = {
"\n 0: English, 1: Japanese\n", /* 48 */
NULL,
},
#ifndef NO_MULTIBYTE_PRINT
/* Japanese */
{
" 注意 : 全てのファイルは"
@ -570,6 +571,7 @@ static const char* server_usage_msg[][49] = {
"\n 0: 英語、 1: 日本語\n", /* 48 */
NULL,
},
#endif
};

8
wolfcrypt/benchmark/benchmark.c
View File

@ -433,6 +433,7 @@ static const char* bench_Usage_msg1[][10] = {
"-lng <num> Display benchmark result by specified language.\n 0: English, 1: Japanese\n",
"<num> Size of block in bytes\n",
},
#ifndef NO_MULTIBYTE_PRINT
/* 1 Japanese */
{ "-? <num> ヘルプ, 使い方を表示します。\n 0: 英語、 1: 日本語\n",
"-csv csv 形式で端末に出力します。\n",
@ -445,11 +446,14 @@ static const char* bench_Usage_msg1[][10] = {
"-lng <num> 指定された言語でベンチマーク結果を表示します。\n 0: 英語、 1: 日本語\n",
"<num> ブロックサイズをバイト単位で指定します。\n",
},
#endif
};
static const char* bench_result_words1[][4] = {
{ "tooks", "seconds" , "Cycles per byte", NULL }, /* 0 English */
#ifndef NO_MULTIBYTE_PRINT
{ "を" , "秒で処理", "1バイトあたりのサイクル数", NULL }, /* 1 Japanese */
#endif
};
#if !defined(NO_RSA) ||defined(WOLFSSL_KEY_GEN) || defined(HAVE_NTRU) || \
@ -460,7 +464,9 @@ static const char* bench_result_words1[][4] = {
static const char* bench_desc_words[][9] = {
/* 0 1 2 3 4 5 6 7 8 */
{"public", "private", "key gen", "agree" , "sign", "verify", "encryption", "decryption", NULL}, /* 0 English */
#ifndef NO_MULTIBYTE_PRINT
{"公開鍵", "秘密鍵" ,"鍵生成" , "鍵共有" , "署名", "検証" , "暗号化" , "復号化" , NULL}, /* 1 Japanese */
#endif
};
#endif
@ -577,7 +583,9 @@ static const char* bench_desc_words[][9] = {
#if defined(BENCH_ASYM)
static const char* bench_result_words2[][5] = {
{ "ops took", "sec" , "avg" , "ops/sec", NULL }, /* 0 English */
#ifndef NO_MULTIBYTE_PRINT
{ "回処理を", "秒で実施", "平均", "処理/秒", NULL }, /* 1 Japanese */
#endif
};
#endif