Changeset 4622:296e096c6331

Timestamp:

2006-04-28 01:35:02 (3 years ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

pdmef+fix+sslinterface. Triggered by a warning when compiling
with POP and GNUTLS, I noticed the SSL interfaces for OpenSSL
and GNUTLS internally are different which doesn't make sense.

Files:

• buffy.c (modified) (2 diffs)
• configure.in (modified) (3 diffs)
• globals.h (modified) (2 diffs)
• imap/imap.c (modified) (4 diffs)
• init.c (modified) (1 diff)
• init.h (modified) (7 diffs)
• main.c (modified) (1 diff)
• mutt.h (modified) (3 diffs)
• mutt_socket.c (modified) (2 diffs)
• mutt_ssl.c (modified) (1 diff)
• mutt_ssl.h (modified) (1 diff)
• mutt_ssl_gnutls.c (modified) (3 diffs)
• pop_lib.c (modified) (3 diffs)

buffy.c

@@ -310 +310 @@
 #ifdef USE_IMAP
     if (tmp->magic != M_IMAP)
+    {
 #endif
 #ifdef USE_POP
@@ -328 +329 @@
       continue;
     }
+#ifdef USE_IMAP
+    }
+#endif
 
     /* check to see if the folder is the currently selected folder

configure.in

@@ -588 +588 @@
 
           AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+          AC_DEFINE(USE_SSL_OPENSSL,1,[ Define if you want support for SSL via OpenSSL. ])
           LIBS="$saved_LIBS"
           MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
@@ -598 +599 @@
 AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]),
     [gnutls_prefix="$withval"], [gnutls_prefix="no"])
-if test "$gnutls_prefix" != "no"
+if test "$gnutls_prefix" != "no" -a x"$need_ssl" != xyes
 then
   if test "$need_socket" != "yes"
@@ -608 +609 @@
     CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
     MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
-    AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.])
+
+    AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+    AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via GNUTLS. ])
 
     MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"

globals.h

@@ -116 +116 @@
 WHERE char *Spoolfile;
 WHERE char *SpamSep;
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
 WHERE char *SslCertFile INITVAL (NULL);
 #endif
-#ifdef USE_SSL
+#ifdef USE_SSL_OPENSSL
 WHERE char *SslClientCert INITVAL (NULL);
 WHERE LIST *SslSessionCerts INITVAL (NULL);
@@ -126 +126 @@
 WHERE char *SslEntropyFile INITVAL (NULL);
 #endif
-#ifdef USE_GNUTLS
+#ifdef USE_SSL_GNUTLS
 WHERE short SslDHPrimeBits;
 WHERE char *SslCACertFile INITVAL (NULL);

imap/imap.c

@@ -33 +33 @@
 #include "message.h"
 #include "imap_private.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
 # include "mutt_ssl.h"
 #endif
@@ -410 +410 @@
         && imap_check_capabilities (idata))
       goto bail;
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
     /* Attempt STARTTLS if available and desired. */
     if (!idata->conn->ssf && (option(OPTSSLFORCETLS) ||
@@ -427 +427 @@
         if (rc != -2)
         {
-#ifdef USE_SSL
           if (mutt_ssl_starttls (idata->conn))
-#elif USE_GNUTLS
-          if (mutt_gnutls_starttls (idata->conn))
-#endif
           {
             mutt_error (_("Could not negotiate TLS connection"));
@@ -470 +466 @@
   return 0;
 
+#if defined(USE_SSL)
  err_close_conn:
   mutt_socket_close (idata->conn);
   idata->state = IMAP_DISCONNECTED;
+#endif
  bail:
   FREE (&idata->capstr);

init.c

@@ -32 +32 @@
 #include "mutt_idna.h"
 
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
 #include "mutt_ssl.h"
 #endif

init.h

@@ -93 +93 @@
 #  define USE_POP
 # endif
+# ifndef USE_SSL_OPENSSL
+#  define USE_SSL_OPENSSL
+# endif
+# ifndef USE_SSL_GNUTLS
+#  define USE_SSL_GNUTLS
+# endif
 # ifndef USE_SSL
 #  define USE_SSL
-# endif
-# ifndef USE_GNUTLS
-#  define USE_GNUTLS
 # endif
 # ifndef USE_SOCKET
@@ -1915 +1918 @@
   */
   
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-#ifdef USE_SSL
+#if defined(USE_SSL)
+#ifdef USE_SSL_OPENSSL
   { "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
   /*
@@ -1923 +1926 @@
   ** key.
   */
-#endif /* USE_SSL */
+#endif /* USE_SSL_OPENSSL */
   { "ssl_force_tls",            DT_BOOL, R_NONE, OPTSSLFORCETLS, 0 },
   /*
@@ -1955 +1958 @@
   ** Example: set certificate_file=~/.mutt/certificates
   */
-# if defined _MAKEDOC || !defined(USE_GNUTLS)
+# if defined _MAKEDOC || !defined(USE_SSL_GNUTLS)
   { "ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1 },
   /*
@@ -1975 +1978 @@
   ** SSL authentication process.
   */
-# endif /* defined _MAKEDOC || !defined(USE_GNUTLS) */
+# endif /* defined _MAKEDOC || !defined(USE_SSL_GNUTLS) */
   { "ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1 },
   /*
@@ -1988 +1991 @@
   ** SSL authentication process.
   */
-# ifdef USE_GNUTLS
+# ifdef USE_SSL_GNUTLS
   { "ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, 0 },
   /*
@@ -2005 +2008 @@
   ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
   */
-# endif /* USE_GNUTLS */
-#endif /* defined(USE_SSL) || defined(USE_GNUTLS) */
+# endif /* USE_SSL_GNUTLS */
+#endif /* defined(USE_SSL) */
 
   { "pipe_split",       DT_BOOL, R_NONE, OPTPIPESPLIT, 0 },

main.c

@@ -265 +265 @@
 
         
-#ifdef USE_SSL
-        "+USE_SSL  "
-#else
-        "-USE_SSL  "
-#endif
-
-#ifdef USE_GNUTLS
-        "+USE_GNUTLS  "
-#else
-        "-USE_GNUTLS  "
+#ifdef USE_SSL_OPENSSL
+        "+USE_SSL_OPENSSL  "
+#else
+        "-USE_SSL_OPENSSL  "
+#endif
+
+#ifdef USE_SSL_GNUTLS
+        "+USE_SSL_GNUTLS  "
+#else
+        "-USE_SSL_GNUTLS  "
 #endif
 

mutt.h

@@ -249 +249 @@
   /* options for socket code */
   M_NEW_SOCKET,
-#ifdef USE_SSL
+#ifdef USE_SSL_OPENSSL
   M_NEW_SSL_SOCKET,
 #endif
@@ -290 +290 @@
   OPT_REPLYTO,
   OPT_RECALL,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
   OPT_SSLSTARTTLS,
 #endif
@@ -377 +377 @@
   OPTIMAPSERVERNOISE,
 #endif
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# ifndef USE_GNUTLS
+#if defined(USE_SSL)
+# ifndef USE_SSL_GNUTLS
   OPTSSLSYSTEMCERTS,
   OPTSSLV2,
-# endif /* USE_GNUTLS */
+# endif /* USE_SSL_GNUTLS */
   OPTSSLV3,
   OPTTLSV1,
   OPTSSLFORCETLS,
-#endif /* defined(USE_SSL) || defined(USE_GNUTLS) */
+#endif /* defined(USE_SSL) */
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,

mutt_socket.c

@@ -27 +27 @@
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
 # include "mutt_ssl.h"
 #endif
@@ -276 +276 @@
   else if (account->flags & M_ACCT_SSL) 
   {
-#ifdef USE_SSL
-    ssl_socket_setup (conn);
-#elif USE_GNUTLS
-    if (mutt_gnutls_socket_setup (conn) < 0)
+#if defined(USE_SSL)
+    if (mutt_ssl_socket_setup (conn) < 0)
     {
       mutt_socket_free (conn);

mutt_ssl.c

@@ -230 +230 @@
 
 
-int ssl_socket_setup (CONNECTION * conn)
+int mutt_ssl_socket_setup (CONNECTION * conn)
 {
   if (ssl_init() < 0)

mutt_ssl.h

@@ -22 +22 @@
 #include "mutt_socket.h"
 
-#ifdef USE_SSL
+#if defined(USE_SSL)
 int mutt_ssl_starttls (CONNECTION* conn);
+int mutt_ssl_socket_setup (CONNECTION *conn);
+#endif
 
-extern int ssl_socket_setup (CONNECTION *conn);
-#endif
-#ifdef USE_GNUTLS
-int mutt_gnutls_starttls (CONNECTION* conn);
-
-extern int mutt_gnutls_socket_setup (CONNECTION *conn);
-#endif
 #endif /* _MUTT_SSL_H_ */

mutt_ssl_gnutls.c

@@ -73 +73 @@
 }
 
-int mutt_gnutls_socket_setup (CONNECTION* conn)
+int mutt_ssl_socket_setup (CONNECTION* conn)
 {
   if (tls_init() < 0)
@@ -145 +145 @@
 }
 
-int mutt_gnutls_starttls (CONNECTION* conn)
+int mutt_ssl_starttls (CONNECTION* conn)
 {
   if (tls_init() < 0)
@@ -442 +442 @@
           {
             regfree(&preg);
-            safe_free((void**)&linestr);
+            FREE(&linestr);
             fclose(fp);
             return 1;

pop_lib.c

@@ -25 +25 @@
 #include "url.h"
 #include "pop.h"
-#ifdef USE_SSL
+#if defined(USE_SSL)
 # include "mutt_ssl.h"
 #endif
@@ -275 +275 @@
   }
 
-#if defined(USE_SSL) || defined(USE_GNUTLS)
+#if defined(USE_SSL)
   /* Attempt STLS if available and desired. */
   if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS)))
@@ -302 +302 @@
         mutt_sleep (2);
       }
-#ifdef USE_SSL
       else if (mutt_ssl_starttls (pop_data->conn))
-#elif USE_GNUTLS
-      else if (mutt_gnutls_starttls (pop_data->conn))
-#endif
       {
         mutt_error (_("Could not negotiate TLS connection"));