diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c index f45409c5..db070a55 100644 --- a/src/Mayaqua/Encrypt.c +++ b/src/Mayaqua/Encrypt.c @@ -3117,7 +3117,7 @@ K *OpensslEngineToK(char *key_file_name, char *engine_name) K *k; #if OPENSSL_API_COMPAT < 0x10100000L ENGINE_load_dynamic(); -#endif // OPENSSL_API_COMPAT >= 0x10100000L +#endif // OPENSSL_API_COMPAT < 0x10100000L ENGINE *engine = ENGINE_by_id(engine_name); ENGINE_init(engine); EVP_PKEY *pkey; diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index 57aa15bf..10db1f9e 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -6875,6 +6875,11 @@ CMD_AccountSecureCertSet_PROMPT_CERTNAME 智能卡证书对象名: CMD_AccountSecureCertSet_PROMPT_KEYNAME 智能卡私匙对象名: +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: + + # AccountRetrySet 命令 CMD_AccountRetrySet 设置连接设置的连接失败或断开时建立重新连接的次数和间隔 CMD_AccountRetrySet_Help 指定注册到 VPN Client 的连接设置,且其连接设置试图连接到 VPN Server 时,还有连接中的与 VPN Server 的通信被断开或连接失败时,指定连接的重试次数和连接重试的间隔。\n而且,如果用户认证类型为 [智能卡认证] 时,不管连接重试次数如何设置,都将不进行连接重试。 diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index 1f8086be..81128380 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -6860,6 +6860,7 @@ CMD_AccountSecureCertSet_KEYNAME Specify the name of the private key object stor CMD_AccountSecureCertSet_PROMPT_CERTNAME Name of Certificate Object on Smart Card: CMD_AccountSecureCertSet_PROMPT_KEYNAME Name of Private Key Object on Smart Card: + # PcAccountOpensslEngineCertSet CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index acdddf78..f5b638ad 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -6866,6 +6866,11 @@ CMD_AccountSecureCertSet_PROMPT_CERTNAME スマートカード内証明書オブ CMD_AccountSecureCertSet_PROMPT_KEYNAME スマートカード内秘密鍵オブジェクトの名前: +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: + + # AccountRetrySet コマンド CMD_AccountRetrySet 接続設定の接続失敗または切断時の再試行回数と間隔の設定 CMD_AccountRetrySet_Help VPN Client に登録されている接続設定を指定し、その接続設定が VPN Server に接続しようとする際、または接続中に VPN Server との通信が切断されたり、接続に失敗したりした場合に、接続を再試行する回数と接続再試行間隔を指定します。\nなお、ユーザー認証の種類が [スマートカード認証] の場合は、接続試行回数の設定にかかわらず、再試行は行いません。 diff --git a/src/bin/hamcore/strtable_ko.stb b/src/bin/hamcore/strtable_ko.stb index c39d1abe..5213c491 100644 --- a/src/bin/hamcore/strtable_ko.stb +++ b/src/bin/hamcore/strtable_ko.stb @@ -6839,6 +6839,11 @@ CMD_AccountSecureCertSet_[name] 설정을 변경하려면 연결 설정의 이 CMD_AccountSecureCertSet_CERTNAME 스마트 카드에 저장되어있는 인증서 개체의 이름을 지정합니다. CMD_AccountSecureCertSet_KEYNAME 스마트 카드에 저장되어있는 비밀 열쇠 오브젝트의 이름을 지정합니다./CERTNAME에 지정된 인증서에 대응하고있을 필요가 있습니다. CMD_AccountSecureCertSet_PROMPT_CERTNAME 스마트 카드에서 인증서 개체의 이름: + + +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: CMD_AccountSecureCertSet_PROMPT_KEYNAME 스마트 카드의 비밀 열쇠 오브젝트의 이름: diff --git a/src/bin/hamcore/strtable_pt_br.stb b/src/bin/hamcore/strtable_pt_br.stb index c31367e8..e9b7a3f3 100644 --- a/src/bin/hamcore/strtable_pt_br.stb +++ b/src/bin/hamcore/strtable_pt_br.stb @@ -6594,6 +6594,11 @@ CMD_AccountSecureCertSet_PROMPT_CERTNAME Name of Certificate Object on Smart Car CMD_AccountSecureCertSet_PROMPT_KEYNAME Name of Private Key Object on Smart Card: +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: + + # AccountRetrySet コマンド CMD_AccountRetrySet Set Interval between Connection Retries for Connection Failures or Disconnections of VPN Connection Setting CMD_AccountRetrySet_Help When a VPN Connection Setting registered on the VPN Client is specified and that VPN Connection Setting attempts to connect to a VPN Server, use this to specify the interval to wait between connection attempts and the limit of how many times to retry connecting when communication with the VPN Server has been disconnected or when the connection process failed. \nIf the user authentication type is Smart Card Authentication, no connection retry will be performed regardless of the Number of Connection Attempts setting. diff --git a/src/bin/hamcore/strtable_ru.stb b/src/bin/hamcore/strtable_ru.stb index 4185e49d..e7187a48 100644 --- a/src/bin/hamcore/strtable_ru.stb +++ b/src/bin/hamcore/strtable_ru.stb @@ -6847,6 +6847,11 @@ CMD_AccountSecureCertSet_PROMPT_CERTNAME Name of Certificate Object on Smart Car CMD_AccountSecureCertSet_PROMPT_KEYNAME Name of Private Key Object on Smart Card: +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: + + # AccountRetrySet コマンド CMD_AccountRetrySet Set Interval between Connection Retries for Connection Failures or Disconnections of VPN Connection Setting CMD_AccountRetrySet_Help When a VPN Connection Setting registered on the VPN Client is specified and that VPN Connection Setting attempts to connect to a VPN Server, use this to specify the interval to wait between connection attempts and the limit of how many times to retry connecting when communication with the VPN Server has been disconnected or when the connection process failed. \nIf the user authentication type is Smart Card Authentication, no connection retry will be performed regardless of the Number of Connection Attempts setting. diff --git a/src/bin/hamcore/strtable_tw.stb b/src/bin/hamcore/strtable_tw.stb index eebd2f9f..4297efbb 100644 --- a/src/bin/hamcore/strtable_tw.stb +++ b/src/bin/hamcore/strtable_tw.stb @@ -6877,6 +6877,11 @@ CMD_AccountSecureCertSet_PROMPT_CERTNAME 智慧卡證書對象名: CMD_AccountSecureCertSet_PROMPT_KEYNAME 智慧卡私匙對象名: +# PcAccountOpensslEngineCertSet +CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key name: +CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: + + # AccountRetrySet 命令 CMD_AccountRetrySet 設置連接設置的連接失敗或斷開時建立重新連接的次數和間隔 CMD_AccountRetrySet_Help 指定註冊到 VPN Client 的連接設置,且其連接設置試圖連接到 VPN Server 時,還有連接中的與 VPN Server 的通信被斷開或連接失敗時,指定連接的重試次數和連接重試的間隔。\n而且,如果用戶認證類型為 [智慧卡認證] 時,不管連接重試次數如何設置,都將不進行連接重試。