[w3m-dev 02833] ssl_forbid_method in SSL Setting

From: Fumitoshi UKAI  <ukai@debian.or.jp>

2 files changed, 27 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 12d561c..0ac4cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
 	* NEWS: support external URI loader
 	* config.h.dist (USE_EXTERNAL_URI_LOADER): added
@@ -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 $
diff --git a/rc.c b/rc.c
index 436e51d..e6d0a10 100644
--- a/rc.c
+++ b/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: を送らないようにする"
 #define CMT_IGNORE_CASE "サーチ時に大文字小文字の区別をしない"
 #define CMT_USE_LESSOPEN "LESSOPENを使用"
-#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
+#ifdef USE_SSL
+#ifdef USE_SSL_VERIFY
 #define CMT_SSL_VERIFY_SERVER "SSLのサーバ認証を行う"
 #define CMT_SSL_CERT_FILE "SSLのクライアント用PEM形式証明書ファイル"
 #define CMT_SSL_KEY_FILE "SSLのクライアント用PEM形式秘密鍵ファイル"
 #define CMT_SSL_CA_PATH "SSLの認証局のPEM形式証明書群のあるディレクトリへのパス"
 #define CMT_SSL_CA_FILE "SSLの認証局のPEM形式証明書群のファイル"
-#endif				/* defined(USE_SSL) &&
-				 * defined(USE_SSL_VERIFY) */
-#ifdef USE_SSL
+#endif /* USE_SSL_VERIFY */
 #define CMT_SSL_FORBID_METHOD "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t:TLSv1)"
-#endif
+#endif /* USE_SSL */
 #ifdef USE_COOKIE
 #define CMT_USECOOKIE "クッキーを使用する"
 #define CMT_ACCEPTCOOKIE "クッキーを受け付ける"
@@ -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[] = {
     {"外部プログラム", params6},
     {"ネットワークの設定", params9},
     {"プロキシの設定", params4},
-#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
+#ifdef USE_SSL
     {"SSL認証設定", params7},
-#endif				/* defined(USE_SSL) &&
-				 * defined(USE_SSL_VERIFY) */
+#endif
 #ifdef USE_COOKIE
     {"クッキーの設定", 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