diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2021-02-28 07:56:52 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2021-02-28 07:56:52 +0000 |
| commit | 62ee6a1e1aa91873d391801d54577b699dcb8998 (patch) | |
| tree | fdf7147c50d8fba3f03c87c707cf406017a95718 | |
| parent | New patch 040_libwc-overflow.patch to fix integer overflow in libwc (diff) | |
| download | w3m-62ee6a1e1aa91873d391801d54577b699dcb8998.tar.gz w3m-62ee6a1e1aa91873d391801d54577b699dcb8998.zip | |
Revert 020_ssl-ca.patch and use ssl_ca_path to keep old behavior
| -rw-r--r-- | debian/patches/020_ssl-ca.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/w3mconfig | 4 |
3 files changed, 2 insertions, 17 deletions
diff --git a/debian/patches/020_ssl-ca.patch b/debian/patches/020_ssl-ca.patch deleted file mode 100644 index 9d2b834..0000000 --- a/debian/patches/020_ssl-ca.patch +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Fix OpenSSL default always overrides ssl_ca_file and ssl_ca_path -Author: Tatsuya Kinoshita <tats@debian.org> - ---- a/url.c -+++ b/url.c -@@ -445,7 +445,7 @@ openSSLHandle(int sock, char *hostname, char **p_cert) - } - } - if ((!ssl_ca_file && !ssl_ca_path) -- || SSL_CTX_load_verify_locations(ssl_ctx, ssl_ca_file, ssl_ca_path)) -+ || !SSL_CTX_load_verify_locations(ssl_ctx, ssl_ca_file, ssl_ca_path)) - #endif /* defined(USE_SSL_VERIFY) */ - SSL_CTX_set_default_verify_paths(ssl_ctx); - #endif /* SSLEAY_VERSION_NUMBER >= 0x0800 */ diff --git a/debian/patches/series b/debian/patches/series index 043b91c..118abf0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 010_section.patch -020_ssl-ca.patch 030_str-overflow.patch 040_libwc-overflow.patch diff --git a/debian/w3mconfig b/debian/w3mconfig index cb1594b..930938f 100644 --- a/debian/w3mconfig +++ b/debian/w3mconfig @@ -99,8 +99,8 @@ ssl_forbid_method 2, 3 ssl_verify_server 1 ssl_cert_file ssl_key_file -ssl_ca_path -ssl_ca_file /etc/ssl/certs/ca-certificates.crt +ssl_ca_path /etc/ssl/certs +ssl_ca_file use_cookie 1 show_cookie 0 accept_cookie 1 |