diff --git a/IDE/IAR-EWARM/Projects/user_settings.h b/IDE/IAR-EWARM/Projects/user_settings.h index d2d3f838e..6dacfb917 100644 --- a/IDE/IAR-EWARM/Projects/user_settings.h +++ b/IDE/IAR-EWARM/Projects/user_settings.h @@ -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 */ diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index ab882eaae..546cde7e5 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -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 >>> diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h index dbf6ad929..e8ba54756 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h @@ -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 >>> - // Common options // MPU<0=>Undefined<1=>STM32F2xx<2=>STM32F4xx<3=>STM32F7xx #define MDK_CONF_MPU 3 diff --git a/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h b/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h index a444230ef..ffce5bd40 100644 --- a/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h +++ b/IDE/MDK5-ARM/Projects/CryptTest/RTE/wolfSSL/user_settings.h @@ -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 >>> diff --git a/examples/client/client.c b/examples/client/client.c index 134164f35..ddf5d52cc 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -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 }; diff --git a/examples/server/server.c b/examples/server/server.c index 22bdae270..7a8a57df5 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -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 }; diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 7e786f5aa..23b43ecd1 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -433,6 +433,7 @@ static const char* bench_Usage_msg1[][10] = { "-lng Display benchmark result by specified language.\n 0: English, 1: Japanese\n", " Size of block in bytes\n", }, +#ifndef NO_MULTIBYTE_PRINT /* 1 Japanese */ { "-? ヘルプ, 使い方を表示します。\n 0: 英語、 1: 日本語\n", "-csv csv 形式で端末に出力します。\n", @@ -445,11 +446,14 @@ static const char* bench_Usage_msg1[][10] = { "-lng 指定された言語でベンチマーク結果を表示します。\n 0: 英語、 1: 日本語\n", " ブロックサイズをバイト単位で指定します。\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