X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl.c;h=2354cd98d1ff933ed06ac60142ca861f7224905a;hp=f73cca73ca2b022ee5db8d60b84a4af6869e826a;hb=a8aba140a61d5b86093cea46afcb613092d4978d;hpb=29ed7b79229bb8e12bb1ead911a9a48031861ede

diff --git a/mutt_ssl.c b/mutt_ssl.c
index f73cca7..2354cd9 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -18,19 +18,18 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#undef _
-
 #include <string.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_socket.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_ssl.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x00904000L
@@ -64,7 +63,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);
@@ -86,7 +85,7 @@ int mutt_ssl_starttls (CONNECTION * conn)
   if (ssl_init ())
     goto bail;
 
-  ssldata = (sslsockdata *) mem_calloc (1, sizeof (sslsockdata));
+  ssldata = p_new(sslsockdata, 1);
   /* the ssl_use_xxx protocol options don't apply. We must use TLS in TLS. */
   if (!(ssldata->ctx = SSL_CTX_new (TLSv1_client_method ()))) {
     debug_print (1, ("Error allocating SSL_CTX\n"));
@@ -120,11 +119,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;
 }
@@ -258,7 +257,7 @@ static int ssl_socket_open (CONNECTION * conn)
   if (raw_socket_open (conn) < 0)
     return -1;
 
-  data = (sslsockdata *) mem_calloc (1, sizeof (sslsockdata));
+  data = p_new(sslsockdata, 1);
   conn->sockdata = data;
 
   data->ctx = SSL_CTX_new (SSLv23_client_method ());
@@ -350,7 +349,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);
@@ -413,15 +412,15 @@ static char *x509_get_part (char *line, const char *ndx)
   static char ret[SHORT_STRING];
   char *c, *c2;
 
-  strfcpy (ret, _("Unknown"), sizeof (ret));
+  m_strcpy(ret, sizeof(ret), _("Unknown"));
 
   c = strstr (line, ndx);
   if (c) {
-    c += str_len (ndx);
+    c += m_strlen(ndx);
     c2 = strchr (c, '/');
     if (c2)
       *c2 = '\0';
-    strfcpy (ret, c, sizeof (ret));
+    m_strcpy(ret, sizeof(ret), c);
     if (c2)
       *c2 = '/';
   }
@@ -436,14 +435,14 @@ static void x509_fingerprint (char *s, int l, X509 * cert)
   int j;
 
   if (!X509_digest (cert, EVP_md5 (), md, &n)) {
-    snprintf (s, l, "%s", _("[unable to calculate]"));
+    m_strcpy(s, l, _("[unable to calculate]"));
   }
   else {
     for (j = 0; j < (int) n; j++) {
       char ch[8];
 
-      snprintf (ch, 8, "%02X%s", md[j], (j % 2 ? " " : ""));
-      str_cat (s, l, ch);
+      snprintf(ch, 8, "%02X%s", md[j], (j % 2 ? " " : ""));
+      m_strcat(s, l, ch);
     }
   }
 }
@@ -453,7 +452,7 @@ static char *asn1time_to_string (ASN1_UTCTIME * tm)
   static char buf[64];
   BIO *bio;
 
-  strfcpy (buf, _("[invalid date]"), sizeof (buf));
+  m_strcpy(buf, sizeof(buf), _("[invalid date]"));
 
   bio = BIO_new (BIO_s_mem ());
   if (bio) {
@@ -584,13 +583,13 @@ static int ssl_check_certificate (sslsockdata * data)
   /* interactive check from user */
   menu = mutt_new_menu ();
   menu->max = 19;
-  menu->dialog = (char **) mem_calloc (1, menu->max * sizeof (char *));
+  menu->dialog = p_new(char *, menu->max);
   for (i = 0; i < menu->max; i++)
-    menu->dialog[i] = (char *) mem_calloc (1, SHORT_STRING * sizeof (char));
+    menu->dialog[i] = p_new(char, SHORT_STRING);
 
   row = 0;
-  strfcpy (menu->dialog[row], _("This certificate belongs to:"),
-           SHORT_STRING);
+  m_strcpy(menu->dialog[row], SHORT_STRING,
+           _("This certificate belongs to:"));
   row++;
   name = X509_NAME_oneline (X509_get_subject_name (data->cert),
                             buf, sizeof (buf));
@@ -600,8 +599,8 @@ static int ssl_check_certificate (sslsockdata * data)
   }
 
   row++;
-  strfcpy (menu->dialog[row], _("This certificate was issued by:"),
-           SHORT_STRING);
+  m_strcpy(menu->dialog[row], SHORT_STRING,
+           _("This certificate was issued by:"));
   row++;
   name = X509_NAME_oneline (X509_get_issuer_name (data->cert),
                             buf, sizeof (buf));
@@ -637,9 +636,9 @@ static int ssl_check_certificate (sslsockdata * data)
 
   helpstr[0] = '\0';
   mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_GENERIC, OP_EXIT);
-  str_cat (helpstr, sizeof (helpstr), buf);
+  m_strcat(helpstr, sizeof(helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Help"), MENU_GENERIC, OP_HELP);
-  str_cat (helpstr, sizeof (helpstr), buf);
+  m_strcat(helpstr, sizeof(helpstr), buf);
   menu->help = helpstr;
 
   done = 0;