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

* url.c (openSSLHandle): add support for TLS SNI (Server NameIndication)

Browse Source
This commit is contained in:
Ito Hiroyuki
2010-07-20 00:09:34 +00:00
parent 715e1bc175
commit c7da065f7f
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ChangeLog
View File

@@ -1,6 +1,10 @@
2010-07-19 d+w3m@vdr.jp 2010-07-20 Sascha Silbe <sascha-debian-bugs-w3m-1@silbe.org>
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329862#20
* url.c (openSSLHandle): add support for TLS SNI (Server Name Indication)
2010-07-19 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329862#20 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329862#20
* table.c (feed_table_tag): check displayLinkNumber. * table.c (feed_table_tag): check displayLinkNumber.
* proto.h: add getLinkNumberStr(). * proto.h: add getLinkNumberStr().
@@ -9,30 +13,26 @@
* file.c (getLinkNumberStr): added. * file.c (getLinkNumberStr): added.
(process_input, process_select, HTMLtagproc1): check displayLinkNumber. (process_input, process_select, HTMLtagproc1): check displayLinkNumber.
2010-07-19 d+w3m@vdr.jp 2010-07-19 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329863#8 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329863#8
* rc.c: Introduce option pseudo_inlines. * rc.c: Introduce option pseudo_inlines.
* fm.h: add global variable pseudoInlines. * fm.h: add global variable pseudoInlines.
* file.c (process_img): check q. * file.c (process_img): check q.
2010-07-19 d+w3m@vdr.jp 2010-07-19 "Trent W. Buck" <twb@cybersource.com.au>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537706#10 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537706#10
* rc.c (interpret_rc): check line->length before call Strchop(). * rc.c (interpret_rc): check line->length before call Strchop().
2010-07-19 d+w3m@vdr.jp 2010-07-19 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=366284#5 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=366284#5
* rc.c (init_rc): check config_file is NULL or not. * rc.c (init_rc): check config_file is NULL or not.
(panel_set_option): check config_file instead of no_rc_dir. (panel_set_option): check config_file instead of no_rc_dir.
2010-07-19 d+w3m@vdr.jp 2010-07-19 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=261174#10 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=261174#10
* terms.c (graph_ok): check UseGraphicChar is GRAPHIC_CHAR_ALL or not. * terms.c (graph_ok): check UseGraphicChar is GRAPHIC_CHAR_ALL or not.
* symbol.c (get_symbol): check UseGraphicChar. * symbol.c (get_symbol): check UseGraphicChar.
@@ -41,9 +41,8 @@
* fm.h (GRAPHIC_CHAR_ASCII, GRAPHIC_CHAR_CHARSET, GRAPHIC_CHAR_ALL): added. * fm.h (GRAPHIC_CHAR_ASCII, GRAPHIC_CHAR_CHARSET, GRAPHIC_CHAR_ALL): added.
* fm.h: UseGraphicChar is initialized as GRAPHIC_CHAR_ASCII. * fm.h: UseGraphicChar is initialized as GRAPHIC_CHAR_ASCII.
2010-07-19 d+w3m@vdr.jp 2010-07-19 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=185006#22 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=185006#22
* main.c (sig_chld): save exit code to d->err. * main.c (sig_chld): save exit code to d->err.
(addDownloadList): initialize d->running and d->err. (addDownloadList): initialize d->running and d->err.
@@ -61,9 +60,8 @@
* fm.h: add global variable SimplePreserveSpace. * fm.h: add global variable SimplePreserveSpace.
* file.c (HTMLlineproc0): check SimplePreserveSpace. * file.c (HTMLlineproc0): check SimplePreserveSpace.
2010-07-18 d+w3m@vdr.jp 2010-07-18 Karsten Schoelzel <kuser@gmx.de>
* [w3m-dev 04319] Re: w3m's bugs from bugs.debian.org
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242599#21 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242599#21
* file.c (is_html_type): added. * file.c (is_html_type): added.
(examineFile, loadGeneralFile, _saveBuffer) (examineFile, loadGeneralFile, _saveBuffer)
@@ -87,11 +85,17 @@
* [w3m-dev 04319] Re: w3m's bugs from bugs.debian.org * [w3m-dev 04319] Re: w3m's bugs from bugs.debian.org
* doc/w3m.1: fix typo. * doc/w3m.1: fix typo.
* doc-jp/w3m.1: update * doc-jp/w3m.1: update
2010-07-18 Petr Salinger <Petr.Salinger@seznam.cz>
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493486
* terms.c: fix version check logic for FreeBSD * terms.c: fix version check logic for FreeBSD
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493486
* scripts/w3mman/w3mman2html.cgi.in (Content-Type): 2010-07-18 Colin Watson <cjwatson@ubuntu.com>
"MAN_KEEP_FORMATTING=1" * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=325699
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=325699 * scripts/w3mman/w3mman2html.cgi.in (Content-Type): "MAN_KEEP_FORMATTING=1"
2010-07-18 Ludwig Nussel <ludwig.nussel@...e.de>
* http://www.openwall.com/lists/oss-security/2010/06/14/4
* istream.c (ssl_check_cert_ident): replace \0 to make full string * istream.c (ssl_check_cert_ident): replace \0 to make full string
visible to user (CVE-2010-2074). visible to user (CVE-2010-2074).
@@ -9030,4 +9034,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1015 2010/07/19 23:33:59 htrb Exp $ $Id: ChangeLog,v 1.1016 2010/07/20 00:09:34 htrb Exp $

5
url.c
View File

@@ -1,4 +1,4 @@
/* $Id: url.c,v 1.96 2010/07/18 14:10:09 htrb Exp $ */ /* $Id: url.c,v 1.97 2010/07/20 00:09:34 htrb Exp $ */
#include "fm.h" #include "fm.h"
#ifndef __MINGW32_VERSION #ifndef __MINGW32_VERSION
#include <sys/types.h> #include <sys/types.h>
@@ -375,6 +375,9 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
#if SSLEAY_VERSION_NUMBER >= 0x00905100 #if SSLEAY_VERSION_NUMBER >= 0x00905100
init_PRNG(); init_PRNG();
#endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */ #endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
#if (SSLEAY_VERSION_NUMBER >= 0x00908070) && !defined(OPENSSL_NO_TLSEXT)
SSL_set_tlsext_host_name(handle,hostname);
#endif /* (SSLEAY_VERSION_NUMBER >= 0x00908070) && !defined(OPENSSL_NO_TLSEXT) */
if (SSL_connect(handle) > 0) { if (SSL_connect(handle) > 0) {
Str serv_cert = ssl_get_certificate(handle, hostname); Str serv_cert = ssl_get_certificate(handle, hostname);
if (serv_cert) { if (serv_cert) {