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

Move the -5 option text into the localization array and add a Japanese translation.

pull/1855/head
John Safranek 2019-02-21 10:28:23 -08:00
parent a1ed8e7a67
commit 201c85478e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/client/client.c
View File

@ -988,7 +988,12 @@ static const char* client_usage_msg[][59] = {
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK) !defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
"-2 Disable DH Prime check\n", /* 59 */ "-2 Disable DH Prime check\n", /* 59 */
#endif #endif
#ifdef HAVE_SECURE_RENEGOTIATION
"-4 Use resumption for renegotiation\n", /* 60 */ "-4 Use resumption for renegotiation\n", /* 60 */
#endif
#ifdef HAVE_TRUSTED_CA
"-5 Use Trusted CA Key Indication\n", /* 61 */
#endif
NULL, NULL,
}, },
#ifndef NO_MULTIBYTE_PRINT #ifndef NO_MULTIBYTE_PRINT
@ -1146,6 +1151,9 @@ static const char* client_usage_msg[][59] = {
#endif #endif
#ifdef HAVE_SECURE_RENEGOTIATION #ifdef HAVE_SECURE_RENEGOTIATION
"-4 再交渉に再開を使用\n", /* 60 */ "-4 再交渉に再開を使用\n", /* 60 */
#endif
#ifdef HAVE_TRUSTED_CA
"-5 信頼できる認証局の鍵表示を使用する\n", /* 61 */
#endif #endif
NULL, NULL,
}, },
@ -1290,9 +1298,6 @@ static void Usage(void)
#endif #endif
#ifdef WOLFSSL_MULTICAST #ifdef WOLFSSL_MULTICAST
printf("%s", msg[++msgid]); /* -3 */ printf("%s", msg[++msgid]); /* -3 */
#endif
#ifdef HAVE_TRUSTED_CA
printf("-5 Use Trusted CA Key Indication\n");
#endif #endif
printf("%s", msg[++msgid]); /* -1 */ printf("%s", msg[++msgid]); /* -1 */
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \ #if !defined(NO_DH) && !defined(HAVE_FIPS) && \
@ -1302,6 +1307,9 @@ static void Usage(void)
#ifdef HAVE_SECURE_RENEGOTIATION #ifdef HAVE_SECURE_RENEGOTIATION
printf("%s", msg[++msgid]); /* -4 */ printf("%s", msg[++msgid]); /* -4 */
#endif #endif
#ifdef HAVE_TRUSTED_CA
printf("%s", msg[++msgid]); /* -5 */
#endif
} }
THREAD_RETURN WOLFSSL_THREAD client_test(void* args) THREAD_RETURN WOLFSSL_THREAD client_test(void* args)

9
examples/server/server.c
View File

@ -594,6 +594,9 @@ static const char* server_usage_msg[][49] = {
#endif #endif
"-1 <num> Display a result by specified language." "-1 <num> Display a result by specified language."
"\n 0: English, 1: Japanese\n", /* 48 */ "\n 0: English, 1: Japanese\n", /* 48 */
#ifdef HAVE_TRUSTED_CA
"-5 Use Trusted CA Key Indication\n", /* 51 */
#endif
NULL, NULL,
}, },
#ifndef NO_MULTIBYTE_PRINT #ifndef NO_MULTIBYTE_PRINT
@ -709,10 +712,12 @@ static const char* server_usage_msg[][49] = {
#endif #endif
"-1 <num> 指定された言語で結果を表示します。" "-1 <num> 指定された言語で結果を表示します。"
"\n 0: 英語、 1: 日本語\n", /* 48 */ "\n 0: 英語、 1: 日本語\n", /* 48 */
#ifdef HAVE_TRUSTED_CA
"-5 信頼できる認証局の鍵表示を使用する\n", /* 51 */
#endif
NULL, NULL,
}, },
#endif #endif
}; };
static void Usage(void) static void Usage(void)
@ -826,7 +831,7 @@ static void Usage(void)
#endif #endif
printf("%s", msg[++msgId]); /* -1 */ printf("%s", msg[++msgId]); /* -1 */
#ifdef HAVE_TRUSTED_CA #ifdef HAVE_TRUSTED_CA
printf("-5 Use Trusted CA Key Indication\n"); printf("%s", msg[++msgId]); /* -5 */
#endif /* HAVE_TRUSTED_CA */ #endif /* HAVE_TRUSTED_CA */
} }