storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable --with-cafile by default to use OpenSSL default paths

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-02-22 22:34:03 +09:00
parent e33ed88bc2
commit 301835c267
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -537,7 +537,7 @@ if test x"$enable_sslverify" = xyes; then
AC_MSG_CHECKING(for CA file location) AC_MSG_CHECKING(for CA file location)
AC_ARG_WITH(cafile, AC_ARG_WITH(cafile,
[ --with-cafile[[=CAFILE]] CA file to verify SSL certificate [[guessed]]],, [ --with-cafile[[=CAFILE]] CA file to verify SSL certificate [[guessed]]],,
[with_cafile=yes]) [with_cafile=no])
if test x"$with_cafile" = xyes; then if test x"$with_cafile" = xyes; then
for f in /etc/ssl/certs/ca-certificates.crt \ for f in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \ /etc/pki/tls/certs/ca-bundle.crt \

2
config.h.dist
View File

@@ -129,7 +129,7 @@ INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
#define USE_DIGEST_AUTH #define USE_DIGEST_AUTH
#define USE_SSL #define USE_SSL
#define USE_SSL_VERIFY #define USE_SSL_VERIFY
#define DEF_CAFILE "/etc/ssl/certs/ca-certificates.crt" #define DEF_CAFILE ""
#undef USE_NNTP #undef USE_NNTP
#undef USE_GOPHER #undef USE_GOPHER
#define USE_EXTERNAL_URI_LOADER #define USE_EXTERNAL_URI_LOADER

2
configure vendored
View File

@@ -8590,7 +8590,7 @@ $as_echo_n "checking for CA file location... " >&6; }
if test "${with_cafile+set}" = set; then : if test "${with_cafile+set}" = set; then :
withval=$with_cafile; withval=$with_cafile;
else else
with_cafile=yes with_cafile=no
fi fi
if test x"$with_cafile" = xyes; then if test x"$with_cafile" = xyes; then

4
doc-jp/README.SSL
View File

@@ -43,8 +43,8 @@ SSL サポートについて
SSLの認証局のPEM形式証明書群のあるディレクトリへのパス SSLの認証局のPEM形式証明書群のあるディレクトリへのパス
(デフォルトは<NULL>). (デフォルトは<NULL>).
ssl_ca_file ファイル名 ssl_ca_file ファイル名
SSLの認証局のPEM形式証明書群のファイル(デフォルトはconfigureで SSLの認証局のPEM形式証明書群のファイル(デフォルトはconfigure時に
自動設定). 未設定なら"").
ただし「SSLEAY_VERSION_NUMBER >= 0x0800」な環境でないと無駄なコードが増 ただし「SSLEAY_VERSION_NUMBER >= 0x0800」な環境でないと無駄なコードが増
えるだけなので, configure時にdisableしておいたほうがよいでしょう. えるだけなので, configure時にdisableしておいたほうがよいでしょう.