diff lib/sslcommon.c @ 173:4c288d05b26a

2003-6-8 Brian Masney <[e-mail]> * lib/bookmark.c lib/gftp.h lib/https.c lib/local.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c src/text/gftp-text.c src/gtk/gftp-gtk.c - made the init function for all the protocols return an integer instead of nothing. If there was an error setting up the protocol, GFTP_EFATAL should be returned and the connection should be aborted. The HTTPS protocol uses this to return if SSL support was not compiled in * lib/protocols.c src/text/gftp-text.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/menu-items.c - have gftp_parse_url() log the error messages to the user. This shouldn't have been done in the individual ports * lib/https.c - only initialize the SSL engine the first time a SSL connection is made.

--- a/lib/sslcommon.c	Sun Jun 08 22:31:07 2003 +0000
+++ b/lib/sslcommon.c	Mon Jun 09 00:53:20 2003 +0000
@@ -138,15 +138,17 @@
 int
 gftp_ssl_startup (gftp_request * request)
 {
+  if (gftp_ssl_initialized)
+    return (0);
+
   gftp_ssl_initialized = 1;
 
   /* FIXME _ thread setup */
   /* FIXME - only call this from one place */
   if (!SSL_library_init ())
     {
-      if (request != NULL)
-        request->logging_function (gftp_logging_error, request->user_data,
-                                   _("Cannot initialized the OpenSSL library\n"));
+      request->logging_function (gftp_logging_error, request->user_data,
+                                 _("Cannot initialized the OpenSSL library\n"));
       return (GFTP_EFATAL);
     }
 
@@ -159,7 +161,7 @@
     {
       request->logging_function (gftp_logging_error, request->user_data,
                                  _("Error loading default SSL certificates\n"));
-       return (GFTP_EFATAL);
+      return (GFTP_EFATAL);
     }
 
   SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, gftp_ssl_verify_callback);
@@ -173,7 +175,6 @@
       return (GFTP_EFATAL);
     }
 
-
   return (0);
 }