aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2018-01-06 10:22:10 +0000
committerTatsuya Kinoshita <tats@debian.org>2018-01-06 10:49:57 +0000
commit762e28dc89fc80eb806d5da8a11ad05a036347fb (patch)
tree711b7c38ac03a4314e4ac6aac02b918f0f94081e
parentExtend ssl_forbid_method to disable TLSv1.1 (diff)
downloadw3m-762e28dc89fc80eb806d5da8a11ad05a036347fb.tar.gz
w3m-762e28dc89fc80eb806d5da8a11ad05a036347fb.zip
Fix multi-character character constant for ssl_forbid_method
Diffstat (limited to '')
-rw-r--r--po/de.po4
-rw-r--r--po/ja.po4
-rw-r--r--po/w3m.pot2
-rw-r--r--po/zh_CN.po4
-rw-r--r--po/zh_TW.po4
-rw-r--r--rc.c2
-rw-r--r--url.c6
7 files changed, 13 insertions, 13 deletions
diff --git a/po/de.po b/po/de.po
index 9e8b6f8..b4dcd36 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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"
diff --git a/po/ja.po b/po/ja.po
index 3285d14..95a5341 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -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"
diff --git a/po/w3m.pot b/po/w3m.pot
index 405b70a..bf38ef8 100644
--- a/po/w3m.pot
+++ b/po/w3m.pot
@@ -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
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 00da93b..cf25e22 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.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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3cb862e..44f7a14 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.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"
diff --git a/rc.c b/rc.c
index 3900fb2..2ec12b2 100644
--- a/rc.c
+++ b/rc.c
@@ -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")
diff --git a/url.c b/url.c
index aae5a97..d759383 100644
--- a/url.c
+++ b/url.c
@@ -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