diff options
author | Kevin McCarthy <kevin@8t8.us> | 2018-03-22 20:23:46 -0700 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2018-03-22 20:23:46 -0700 |
commit | 3ffc0ec4848d02cf9d6dd68f75151e401ef3ed04 (patch) | |
tree | a1732e3e8fe2a4cc00affcd5438e267a2aa7e93b /pgp.c | |
parent | 47e6c5aac5200582600cc0823191bb3bc7799daf (diff) |
Remove dead code in pgp.c
pgp_extract_keys_from_messages() has been subsumed by
crypt_extract_keys_from_messages(). The function had incorrect
multi-bit flag comparisons, but since it's dead code, remove it
instead.
Diffstat (limited to 'pgp.c')
-rw-r--r-- | pgp.c | 65 |
1 files changed, 1 insertions, 64 deletions
@@ -763,70 +763,7 @@ int pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempfile) } -/* Extract pgp public keys from messages or attachments */ - -void pgp_extract_keys_from_messages (HEADER *h) -{ - int i; - char tempfname[_POSIX_PATH_MAX]; - FILE *fpout; - - if (h) - { - mutt_parse_mime_message (Context, h); - if(h->security & PGPENCRYPT && !pgp_valid_passphrase ()) - return; - } - - mutt_mktemp (tempfname, sizeof (tempfname)); - if (!(fpout = safe_fopen (tempfname, "w"))) - { - mutt_perror (tempfname); - return; - } - - set_option (OPTDONTHANDLEPGPKEYS); - - if (!h) - { - for (i = 0; i < Context->vcount; i++) - { - if (Context->hdrs[Context->v2r[i]]->tagged) - { - mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]); - if (Context->hdrs[Context->v2r[i]]->security & PGPENCRYPT - && !pgp_valid_passphrase()) - { - safe_fclose (&fpout); - goto bailout; - } - mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]], - MUTT_CM_DECODE|MUTT_CM_CHARCONV, 0); - } - } - } - else - { - mutt_parse_mime_message (Context, h); - if (h->security & PGPENCRYPT && !pgp_valid_passphrase()) - { - safe_fclose (&fpout); - goto bailout; - } - mutt_copy_message (fpout, Context, h, MUTT_CM_DECODE|MUTT_CM_CHARCONV, 0); - } - - safe_fclose (&fpout); - mutt_endwin (NULL); - pgp_invoke_import (tempfname); - mutt_any_key_to_continue (NULL); - - bailout: - - mutt_unlink (tempfname); - unset_option (OPTDONTHANDLEPGPKEYS); - -} +/* Extract pgp public keys from attachments */ static void pgp_extract_keys_from_attachment (FILE *fp, BODY *top) { |