X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=c0ed056fea66946a2a9b381f94359af8400abaa2;hp=30e73e2d91000aba225f6d8041126d8ffa4816e1;hb=5251a17c26fadd6559295f6962f831a97eeeefdb;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/gnupgparse.c b/gnupgparse.c
index 30e73e2..c0ed056 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -96,7 +96,7 @@ static void fix_uid (char *uid)
         memcpy (uid, buf, ob - buf);
         uid[ob - buf] = '\0';
       }
-      else if (ob - buf == n && (buf[n] = 0, safe_strlen (buf) < n))
+      else if (ob - buf == n && (buf[n] = 0, mutt_strlen (buf) < n))
         memcpy (uid, buf, n);
     }
     FREE (&buf);
@@ -130,13 +130,13 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       {
         debug_print (2, ("record type: %s\n", p));
 
-        if (!safe_strcmp (p, "pub"));
-        else if (!safe_strcmp (p, "sub"))
+        if (!mutt_strcmp (p, "pub"));
+        else if (!mutt_strcmp (p, "sub"))
           *is_subkey = 1;
-        else if (!safe_strcmp (p, "sec"));
-        else if (!safe_strcmp (p, "ssb"))
+        else if (!mutt_strcmp (p, "sec"));
+        else if (!mutt_strcmp (p, "ssb"))
           *is_subkey = 1;
-        else if (!safe_strcmp (p, "uid"))
+        else if (!mutt_strcmp (p, "uid"))
           is_uid = 1;
         else
           return NULL;