Commit 762e28dc authored by Tatsuya Kinoshita's avatar Tatsuya Kinoshita

Fix multi-character character constant for ssl_forbid_method

parent 1b23ebf6
......@@ -592,8 +592,8 @@ msgid "File consisting of PEM encoded certificates of CAs"
msgstr "Datei mit PEM-kodierten Zertifikaten von CAs"
#: rc.c:205
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
#: rc.c:208
msgid "Enable cookie processing"
......
......@@ -583,8 +583,8 @@ msgid "File consisting of PEM encoded certificates of CAs"
msgstr "SSLの認証局のPEM形式証明書群のファイル"
#: rc.c:205
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
#: rc.c:208
msgid "Enable cookie processing"
......
......@@ -582,7 +582,7 @@ msgid "File consisting of PEM encoded certificates of CAs"
msgstr ""
#: rc.c:205
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
msgstr ""
#: rc.c:208
......
......@@ -587,8 +587,8 @@ msgid "File consisting of PEM encoded certificates of CAs"
msgstr "包含 PEM 编码 CA 证书的文件"
#: rc.c:205
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
#: rc.c:208
msgid "Enable cookie processing"
......
......@@ -587,8 +587,8 @@ msgid "File consisting of PEM encoded certificates of CAs"
msgstr "包含 PEM 編碼 CA 證書的檔案"
#: rc.c:205
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)"
msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
#: rc.c:208
msgid "Enable cookie processing"
......
......@@ -202,7 +202,7 @@ static int OptionEncode = FALSE;
#define CMT_SSL_CA_PATH N_("Path to directory for PEM encoded certificates of CAs")
#define CMT_SSL_CA_FILE N_("File consisting of PEM encoded certificates of CAs")
#endif /* USE_SSL_VERIFY */
#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)")
#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)")
#endif /* USE_SSL */
#ifdef USE_COOKIE
#define CMT_USECOOKIE N_("Enable cookie processing")
......
......@@ -338,9 +338,9 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
option |= SSL_OP_NO_TLSv1;
if (strchr(ssl_forbid_method, 'T'))
option |= SSL_OP_NO_TLSv1;
if (strchr(ssl_forbid_method, 't1.1'))
option |= SSL_OP_NO_TLSv1_1;
if (strchr(ssl_forbid_method, 'T1.1'))
if (strchr(ssl_forbid_method, '4'))
option |= SSL_OP_NO_TLSv1;
if (strchr(ssl_forbid_method, '5'))
option |= SSL_OP_NO_TLSv1_1;
}
#ifdef SSL_OP_NO_COMPRESSION
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment