2010-10-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Removed warning message when CA certificates are not imported.
	--ca-certificate and --check-certificate option were added to the
	error message displayed when certificate verification failed.
	* src/MultiUrlRequestInfo.cc
	* src/message.h

ChangeLog

@@ -1,3 +1,11 @@
+2010-10-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed warning message when CA certificates are not imported.
+	--ca-certificate and --check-certificate option were added to the
+	error message displayed when certificate verification failed.
+	* src/MultiUrlRequestInfo.cc
+	* src/message.h
+
 2010-10-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Print message when performing slow file allocation at first time.

src/MultiUrlRequestInfo.cc

@@ -159,13 +159,8 @@ downloadresultcode::RESULT MultiUrlRequestInfo::execute()
                                    option_->get(PREF_PRIVATE_KEY));
     }
     if(!option_->blank(PREF_CA_CERTIFICATE)) {
-      if(!tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE))) {
-        logger_->warn(MSG_WARN_NO_CA_CERT);
-      }
-    } else if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) {
-      logger_->warn(MSG_WARN_NO_CA_CERT);
+      tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE));
     }
-
     if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) {
       tlsContext->enablePeerVerification();
     }

src/message.h

@@ -168,7 +168,8 @@
 #define MSG_LOADING_TRUSTED_CA_CERT_FAILED                              \
   _("Failed to load trusted CA certificates from %s. Cause: %s")
 #define MSG_CERT_VERIFICATION_FAILED                    \
-  _("Certificate verification failed. Cause: %s")
+  _("Certificate verification failed. Cause: %s See --ca-certificate and" \
+    " --check-certificate option.")
 #define MSG_NO_CERT_FOUND _("No certificate found.")
 #define MSG_HOSTNAME_NOT_MATCH _("Hostname not match.")
 #define MSG_NO_FILES_TO_DOWNLOAD _("No files to download.")