drop openssl support as well, only use GNUTLS.

[apps/madmutt.git] / imap / imap.c

diff --git a/imap/imap.c b/imap/imap.c
index 6a84d94..43c2426 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -21,9 +21,6 @@
 #include "browser.h"
 #include "message.h"
 #include "imap_private.h"
 #include "browser.h"
 #include "message.h"
 #include "imap_private.h"

-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include <lib-sys/mutt_ssl.h>
-#endif

 #include "buffy.h"
 
 /* imap forward declarations */
 #include "buffy.h"
 
 /* imap forward declarations */


@@ -383,7 +380,6 @@ int imap_open_connection (IMAP_DATA * idata)
     /* TODO: Parse new tagged CAPABILITY data (* OK [CAPABILITY...]) */
     if (imap_check_capabilities (idata))
       goto bail;
     /* TODO: Parse new tagged CAPABILITY data (* OK [CAPABILITY...]) */
     if (imap_check_capabilities (idata))
       goto bail;

-#if defined(USE_SSL) || defined(USE_GNUTLS)

     /* Attempt STARTTLS if available and desired. */
     if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || 
                               mutt_bit_isset (idata->capabilities, STARTTLS))) {
     /* Attempt STARTTLS if available and desired. */
     if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || 
                               mutt_bit_isset (idata->capabilities, STARTTLS))) {


@@ -398,9 +394,7 @@ int imap_open_connection (IMAP_DATA * idata)
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {

-#if defined (USE_SSL) || defined (USE_GNUTLS)

           if (mutt_ssl_starttls (idata->conn))
           if (mutt_ssl_starttls (idata->conn))

-#endif

           {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);
           {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);


@@ -420,7 +414,6 @@ int imap_open_connection (IMAP_DATA * idata)
       mutt_sleep (1);
       goto err_close_conn;
     }
       mutt_sleep (1);
       goto err_close_conn;
     }

-#endif

   }
   else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) {
     idata->state = IMAP_AUTHENTICATED;
   }
   else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) {
     idata->state = IMAP_AUTHENTICATED;