diff options
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/w3m.pot | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 4 | ||||
| -rw-r--r-- | po/zh_TW.po | 4 | ||||
| -rw-r--r-- | rc.c | 2 | ||||
| -rw-r--r-- | url.c | 4 |
7 files changed, 14 insertions, 10 deletions
@@ -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)" -msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1)" +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)" #: 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)" -msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t:TLSv1)" +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)" #: 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)" +msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)" msgstr "" #: rc.c:208 diff --git a/po/zh_CN.po b/po/zh_CN.po index 8cfa8fd..00da93b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -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)" -msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)" +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)" #: rc.c:208 msgid "Enable cookie processing" diff --git a/po/zh_TW.po b/po/zh_TW.po index 954a4d2..3cb862e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -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)" -msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)" +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)" #: 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)") +#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, t1.1: TLSv1.1)") #endif /* USE_SSL */ #ifdef USE_COOKIE #define CMT_USECOOKIE N_("Enable cookie processing") @@ -338,6 +338,10 @@ 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')) + option |= SSL_OP_NO_TLSv1_1; } #ifdef SSL_OP_NO_COMPRESSION option |= SSL_OP_NO_COMPRESSION; |