aboutsummaryrefslogtreecommitdiffstats
path: root/url.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2004-03-30 18:06:42 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2004-03-30 18:06:42 +0000
commitb5bb094440db3c4c643f410c8ac50133e266b1aa (patch)
tree27e7ffa892a6719c4a71e5f0d3fe7b90c9e03eab /url.c
parentfix search problem on different charset page than display charset (diff)
downloadw3m-b5bb094440db3c4c643f410c8ac50133e266b1aa.tar.gz
w3m-b5bb094440db3c4c643f410c8ac50133e266b1aa.zip
[w3m-dev 04050] SSL verify
* url.c (openSSLHandle): don't load verify locations if both ssl_ca_file and ssl_ca_path is NULL. From: AIDA Shinra <shinra@j10n.org>
Diffstat (limited to 'url.c')
-rw-r--r--url.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/url.c b/url.c
index f3888be..0d8d138 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.87 2003/12/08 16:17:21 ukai Exp $ */
+/* $Id: url.c,v 1.88 2004/03/30 18:06:43 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -354,7 +354,8 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
goto eend;
}
}
- if (SSL_CTX_load_verify_locations(ssl_ctx, ssl_ca_file, ssl_ca_path))
+ if ((!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 */