[w3m-dev 02833] ssl_forbid_method in SSL Setting
From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
@@ -1,3 +1,10 @@
|
||||
2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 02833] ssl_forbid_method in SSL Setting
|
||||
* rc.c (params7): ssl_forbid_method moved here
|
||||
* rc.c (params8): ssl_forbid_method removed here
|
||||
* rc.c (sections): params7 ifdef USE_SSL
|
||||
|
||||
2002-01-15 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 02832] external URI loader support
|
||||
@@ -1915,4 +1922,4 @@
|
||||
* release-0-2-1
|
||||
* import w3m-0.2.1
|
||||
|
||||
$Id: ChangeLog,v 1.214 2002/01/14 16:00:59 ukai Exp $
|
||||
$Id: ChangeLog,v 1.215 2002/01/14 16:31:26 ukai Exp $
|
||||
|
||||
43
rc.c
43
rc.c
@@ -1,4 +1,4 @@
|
||||
/* $Id: rc.c,v 1.25 2002/01/14 15:59:17 ukai Exp $ */
|
||||
/* $Id: rc.c,v 1.26 2002/01/14 16:31:26 ukai Exp $ */
|
||||
/*
|
||||
* Initialization file etc.
|
||||
*/
|
||||
@@ -147,17 +147,16 @@ static char *config_file = NULL;
|
||||
#define CMT_NOSENDREFERER "Referer: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʤ<EFBFBD><CAA4>褦<EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD>"
|
||||
#define CMT_IGNORE_CASE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD>ζ<EFBFBD><CEB6>̤ʤ<F2A4B7A4>"
|
||||
#define CMT_USE_LESSOPEN "LESSOPEN<45><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
|
||||
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
|
||||
#ifdef USE_SSL
|
||||
#ifdef USE_SSL_VERIFY
|
||||
#define CMT_SSL_VERIFY_SERVER "SSL<53>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD>ǧ<EFBFBD>ڤ<EFBFBD><DAA4>Ԥ<EFBFBD>"
|
||||
#define CMT_SSL_CERT_FILE "SSL<53>Υ<EFBFBD><CEA5>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>PEM<45><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>"
|
||||
#define CMT_SSL_KEY_FILE "SSL<53>Υ<EFBFBD><CEA5>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>PEM<45><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̩<EFBFBD><CCA9><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>"
|
||||
#define CMT_SSL_CA_PATH "SSL<53><4C>ǧ<EFBFBD>ڶɤ<DAB6>PEM<45><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ<F1B7B2A4><CEA4><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ<EFBFBD><C8A5>ؤΥѥ<CEA5>"
|
||||
#define CMT_SSL_CA_FILE "SSL<53><4C>ǧ<EFBFBD>ڶɤ<DAB6>PEM<45><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υե<CEA5><D5A5><EFBFBD><EFBFBD><EFBFBD>"
|
||||
#endif /* defined(USE_SSL) &&
|
||||
* defined(USE_SSL_VERIFY) */
|
||||
#ifdef USE_SSL
|
||||
#endif /* USE_SSL_VERIFY */
|
||||
#define CMT_SSL_FORBID_METHOD "<22>Ȥ<EFBFBD><C8A4>ʤ<EFBFBD>SSL<53><EFBFBD>åɤΥꥹ<CEA5><EAA5B9>(2: SSLv2, 3: SSLv3, t:TLSv1)"
|
||||
#endif
|
||||
#endif /* USE_SSL */
|
||||
#ifdef USE_COOKIE
|
||||
#define CMT_USECOOKIE "<22><><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD>"
|
||||
#define CMT_ACCEPTCOOKIE "<22><><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>դ<EFBFBD><D5A4><EFBFBD>"
|
||||
@@ -265,17 +264,16 @@ static char *config_file = NULL;
|
||||
#define CMT_NOSENDREFERER "Don't send header `Referer:'"
|
||||
#define CMT_IGNORE_CASE "Ignore case when search"
|
||||
#define CMT_USE_LESSOPEN "Use LESSOPEN"
|
||||
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
|
||||
#ifdef USE_SSL
|
||||
#ifdef USE_SSL_VERIFY
|
||||
#define CMT_SSL_VERIFY_SERVER "Perform SSL server verification"
|
||||
#define CMT_SSL_CERT_FILE "PEM encoded certificate file of client"
|
||||
#define CMT_SSL_KEY_FILE "PEM encoded private key file of client"
|
||||
#define CMT_SSL_CA_PATH "Path to a directory for PEM encoded certificates of CAs"
|
||||
#define CMT_SSL_CA_FILE "File consisting of PEM encoded certificates of CAs"
|
||||
#endif /* defined(USE_SSL) &&
|
||||
* defined(USE_SSL_VERIFY) */
|
||||
#ifdef USE_SSL
|
||||
#endif /* USE_SSL_VERIFY */
|
||||
#define CMT_SSL_FORBID_METHOD "List of forbidden SSL method (2: SSLv2, 3: SSLv3, t:TLSv1)"
|
||||
#endif
|
||||
#endif /* USE_SSL */
|
||||
#ifdef USE_COOKIE
|
||||
#define CMT_USECOOKIE "Use Cookie"
|
||||
#define CMT_ACCEPTCOOKIE "Accept Cookie"
|
||||
@@ -523,8 +521,11 @@ struct param_ptr params6[] = {
|
||||
{NULL, 0, 0, NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
|
||||
#ifdef USE_SSL
|
||||
struct param_ptr params7[] = {
|
||||
{"ssl_forbid_method", P_STRING, PI_TEXT, (void *)&ssl_forbid_method,
|
||||
CMT_SSL_FORBID_METHOD, NULL},
|
||||
#ifdef USE_SSL_VERIFY
|
||||
{"ssl_verify_server", P_INT, PI_ONOFF, (void *)&ssl_verify_server,
|
||||
CMT_SSL_VERIFY_SERVER, NULL},
|
||||
{"ssl_cert_file", P_SSLPATH, PI_TEXT, (void *)&ssl_cert_file,
|
||||
@@ -535,10 +536,10 @@ struct param_ptr params7[] = {
|
||||
NULL},
|
||||
{"ssl_ca_file", P_SSLPATH, PI_TEXT, (void *)&ssl_ca_file, CMT_SSL_CA_FILE,
|
||||
NULL},
|
||||
#endif /* USE_SSL_VERIFY */
|
||||
{NULL, 0, 0, NULL, NULL, NULL},
|
||||
};
|
||||
#endif /* defined(USE_SSL) &&
|
||||
* defined(USE_SSL_VERIFY) */
|
||||
#endif /* USE_SSL */
|
||||
|
||||
#ifdef USE_COOKIE
|
||||
struct param_ptr params8[] = {
|
||||
@@ -578,10 +579,6 @@ struct param_ptr params9[] = {
|
||||
CMT_FOLLOW_REDIRECTION, NULL},
|
||||
{"meta_refresh", P_CHARINT, PI_ONOFF, (void *)&MetaRefresh,
|
||||
CMT_META_REFRESH, NULL},
|
||||
#ifdef USE_SSL
|
||||
{"ssl_forbid_method", P_STRING, PI_TEXT, (void *)&ssl_forbid_method,
|
||||
CMT_SSL_FORBID_METHOD, NULL},
|
||||
#endif /* USE_SSL */
|
||||
#ifdef INET6
|
||||
{"dns_order", P_INT, PI_SEL_C, (void *)&DNS_order, CMT_DNS_ORDER,
|
||||
dnsorders},
|
||||
@@ -600,10 +597,9 @@ struct param_section sections[] = {
|
||||
{"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ץ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", params6},
|
||||
{"<EFBFBD>ͥåȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", params9},
|
||||
{"<EFBFBD>ץ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", params4},
|
||||
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
|
||||
#ifdef USE_SSL
|
||||
{"SSLǧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", params7},
|
||||
#endif /* defined(USE_SSL) &&
|
||||
* defined(USE_SSL_VERIFY) */
|
||||
#endif
|
||||
#ifdef USE_COOKIE
|
||||
{"<EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", params8},
|
||||
#endif
|
||||
@@ -617,10 +613,9 @@ struct param_section sections[] = {
|
||||
{"External Programs", params6},
|
||||
{"Network Setting", params9},
|
||||
{"Proxy Setting", params4},
|
||||
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
|
||||
#ifdef USE_SSL
|
||||
{"SSL Verification Setting", params7},
|
||||
#endif /* defined(USE_SSL) &&
|
||||
* defined(USE_SSL_VERIFY) */
|
||||
#endif
|
||||
#ifdef USE_COOKIE
|
||||
{"Cookie Setting", params8},
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user