diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-09-28 16:30:07 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-09-28 16:30:07 +0000 |
| commit | d4214f39a67ff2c931f661733fe35129b9818e2b (patch) | |
| tree | 1643f41804ba7065d13411cae620ae8c296901b0 /istream.c | |
| parent | [w3m-dev 03321] Bug#162104: file descriptors 1 and 2 are closed rather than r... (diff) | |
| download | w3m-d4214f39a67ff2c931f661733fe35129b9818e2b.tar.gz w3m-d4214f39a67ff2c931f661733fe35129b9818e2b.zip | |
Re: [w3m-dev 03320] Re: Passwords
* etc.c (dir_under): same path is ok
* file.c (loadGeneralFile): if missing, return NULL
ssl cert already checked
* html.h (URLFILE): add ssl_certificate
* istream.c (ssl_get_certificate): change args
* istream.h (ssl_get_certificate): ditto
* url.c (openSSLHandle): add p_cert
ssl certificate check here
(HTTPrequest): auth_cookie fix
From: AIDA Shinra <aida-s@jcom.home.ne.jp>
Diffstat (limited to 'istream.c')
| -rw-r--r-- | istream.c | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: istream.c,v 1.14 2002/02/07 14:02:12 ukai Exp $ */ +/* $Id: istream.c,v 1.15 2002/09/28 16:30:07 ukai Exp $ */ #include "fm.h" #include "istream.h" #include <signal.h> @@ -470,7 +470,7 @@ ssl_check_cert_ident(X509 * x, char *hostname) } Str -ssl_get_certificate(InputStream stream, char *hostname) +ssl_get_certificate(SSL * ssl, char *hostname) { BIO *bp; X509 *x; @@ -483,13 +483,9 @@ ssl_get_certificate(InputStream stream, char *hostname) Str emsg; char *ans; - if (stream == NULL) - return NULL; - if (IStype(stream) != IST_SSL) - return NULL; - if (stream->ssl.handle == NULL) + if (ssl == NULL) return NULL; - x = SSL_get_peer_certificate(stream->ssl.handle->ssl); + x = SSL_get_peer_certificate(ssl); if (x == NULL) { if (accept_this_site && strcasecmp(accept_this_site->ptr, hostname) == 0) @@ -521,7 +517,7 @@ ssl_get_certificate(InputStream stream, char *hostname) */ if (ssl_verify_server) { long verr; - if ((verr = SSL_get_verify_result(stream->ssl.handle->ssl)) + if ((verr = SSL_get_verify_result(ssl)) != X509_V_OK) { const char *em = X509_verify_cert_error_string(verr); if (accept_this_site |