X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgp.c;h=3c3e0f7bd43412c8e8c57b1543a003effa6523a7;hp=d0104a7c740109102c0e941ef01fb8a2c8eebc11;hb=129050c6742f6be13fa5635ba03542b7fb2a9525;hpb=bc45345ba77e08ee3dc159ba0e04bc654f191cd3 diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c index d0104a7..3c3e0f7 100644 --- a/lib-crypt/pgp.c +++ b/lib-crypt/pgp.c @@ -130,7 +130,7 @@ static int pgp_copy_checksig (FILE * fpin, FILE * fpout) rv = 0; } - if (strncmp (line, "[GNUPG:] ", 9) == 0) + if (m_strncmp (line, "[GNUPG:] ", 9) == 0) continue; fputs (line, fpout); fputc ('\n', fpout); @@ -974,7 +974,7 @@ BODY *pgp_sign_message (BODY * a) static short is_numerical_keyid (const char *s) { /* or should we require the "0x"? */ - if (strncmp (s, "0x", 2) == 0) + if (m_strncmp (s, "0x", 2) == 0) s += 2; if (m_strlen(s) % 8) return 0; @@ -1040,7 +1040,7 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc) p->mailbox); if ((r = mutt_yesorno (buf, M_YES)) == M_YES) { if (is_numerical_keyid (keyID)) { - if (strncmp (keyID, "0x", 2) == 0) + if (m_strncmp (keyID, "0x", 2) == 0) keyID += 2; goto bypass_selection; /* you don't see this. */ } @@ -1426,11 +1426,6 @@ int pgp_send_menu (HEADER * msg, int *redraw) crypt_pgp_void_passphrase (); /* probably need a different passphrase */ } -#if 0 - else { - msg->security &= ~SIGN; - } -#endif *redraw = REDRAW_FULL; break;