X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt_ssl.c;h=801da7888b8cce808e3a5bce12ff2eee16227c87;hb=8e037c67a88cb4680c4391134c578e3b55a80f8a;hp=88bd825a1b7f845731bc056079ba911e2c0a67e7;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258;p=apps%2Fmadmutt.git

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 88bd825..801da78 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
+#ifdef USE_SSL
+
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 #include <openssl/err.h>
@@ -20,6 +22,8 @@
 
 #include <string.h>
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "mutt_socket.h"
 #include "mutt_menu.h"
@@ -62,7 +66,7 @@ typedef struct _sslsockdata {
 } sslsockdata;
 
 /* local prototypes */
-int ssl_init (void);
+static int ssl_init (void);
 static int add_entropy (const char *file);
 static int ssl_socket_read (CONNECTION * conn, char *buf, size_t len);
 static int ssl_socket_write (CONNECTION * conn, const char *buf, size_t len);
@@ -118,11 +122,11 @@ int mutt_ssl_starttls (CONNECTION * conn)
   return 0;
 
 bail_ssl:
-  mem_free (&ssldata->ssl);
+  p_delete(&ssldata->ssl);
 bail_ctx:
-  mem_free (&ssldata->ctx);
+  p_delete(&ssldata->ctx);
 bail_ssldata:
-  mem_free (&ssldata);
+  p_delete(&ssldata);
 bail:
   return -1;
 }
@@ -137,7 +141,7 @@ bail:
  * versions also. (That's the reason for the ugly #ifdefs and macros,
  * otherwise I could have simply #ifdef'd the whole ssl_init funcion)
  */
-int ssl_init (void)
+static int ssl_init (void)
 {
   char path[_POSIX_PATH_MAX];
   static unsigned char init_complete = 0;
@@ -219,7 +223,7 @@ static int ssl_socket_open_err (CONNECTION * conn)
 }
 
 
-int ssl_socket_setup (CONNECTION * conn)
+int mutt_ssl_socket_setup (CONNECTION * conn)
 {
   if (ssl_init () < 0) {
     conn->conn_open = ssl_socket_open_err;
@@ -348,7 +352,7 @@ static int ssl_socket_close (CONNECTION * conn)
 #endif
     SSL_free (data->ssl);
     SSL_CTX_free (data->ctx);
-    mem_free (&conn->sockdata);
+    p_delete(&conn->sockdata);
   }
 
   return raw_socket_close (conn);
@@ -707,3 +711,5 @@ static int ssl_passwd_cb (char *buf, int size, int rwflag, void *userdata)
 
   return snprintf (buf, size, "%s", account->pass);
 }
+
+#endif /* USE_SSL */