X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl_gnutls.c;h=4a38893d16fc8a8faf887ea98de74ca02f7757ae;hp=c5429ccb61114aebf69361c2a8d934573eda344a;hb=23ccf6ef725820684b8ab9724e09bfc75d40b941;hpb=faed98ab64dd3cbd29e674141cd074d6c9f8909c

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index c5429cc..4a38893 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -16,8 +16,15 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
+#ifdef HAVE_GNUTLS_OPENSSL_H
+#include <gnutls/openssl.h>
+#endif
 
 #include "mutt.h"
 #include "mutt_socket.h"
@@ -70,10 +77,10 @@ int mutt_gnutls_socket_setup (CONNECTION* conn)
   if (tls_init() < 0)
     return -1;
 
-  conn->open	= tls_socket_open;
-  conn->read	= tls_socket_read;
-  conn->write	= tls_socket_write;
-  conn->close	= tls_socket_close;
+  conn->conn_open	= tls_socket_open;
+  conn->conn_read	= tls_socket_read;
+  conn->conn_write	= tls_socket_write;
+  conn->conn_close	= tls_socket_close;
 
   return 0;
 }
@@ -144,9 +151,9 @@ int mutt_gnutls_starttls (CONNECTION* conn)
   if (tls_negotiate (conn) < 0)
     return -1;
 
-  conn->read	= tls_socket_read;
-  conn->write	= tls_socket_write;
-  conn->close	= tls_starttls_close;
+  conn->conn_read	= tls_socket_read;
+  conn->conn_write	= tls_socket_write;
+  conn->conn_close	= tls_starttls_close;
 
   return 0;
 }
@@ -291,9 +298,9 @@ static int tls_starttls_close (CONNECTION* conn)
   int rc;
 
   rc = tls_socket_close (conn);
-  conn->read = raw_socket_read;
-  conn->write = raw_socket_write;
-  conn->close = raw_socket_close;
+  conn->conn_read = raw_socket_read;
+  conn->conn_write = raw_socket_write;
+  conn->conn_close = raw_socket_close;
 
   return rc;
 }
@@ -456,7 +463,7 @@ static int tls_check_certificate (CONNECTION* conn)
   char helpstr[SHORT_STRING];
   char buf[SHORT_STRING];
   char fpbuf[SHORT_STRING];
-  int buflen;
+  size_t buflen;
   char dn_common_name[SHORT_STRING];
   char dn_email[SHORT_STRING];
   char dn_organization[SHORT_STRING];