X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt_ssl.c;h=aeed4642eb598d5c249dcf76318b6dbc60ae2280;hb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7;hp=6a8303260fffd53d48a7860288030d54de90baa1;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c;p=apps%2Fmadmutt.git

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 6a83032..aeed464 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -18,11 +18,11 @@
 #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"
@@ -30,9 +30,6 @@
 #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
@@ -419,7 +416,7 @@ static char *x509_get_part (char *line, const char *ndx)
 
   c = strstr (line, ndx);
   if (c) {
-    c += str_len (ndx);
+    c += m_strlen(ndx);
     c2 = strchr (c, '/');
     if (c2)
       *c2 = '\0';
@@ -438,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);
     }
   }
 }
@@ -639,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;