-
-int crypt_valid_passphrase (int flags)
-{
- int ret = 0;
-
-# if defined(HAVE_SETRLIMIT)
- disable_coredumps ();
-# endif
-
- if (flags & APPLICATION_PGP)
- ret = crypt_pgp_valid_passphrase ();
-
- if (flags & APPLICATION_SMIME)
- ret = crypt_smime_valid_passphrase ();
-
- return ret;
-}
-
-
-
int mutt_protect (HEADER * msg, char *keylist)
{
BODY *pbody = NULL, *tmp_pbody = NULL;
int mutt_protect (HEADER * msg, char *keylist)
{
BODY *pbody = NULL, *tmp_pbody = NULL;
if ((msg->security & PGPINLINE) == PGPINLINE) {
/* they really want to send it inline... go for it */
if (!isendwin ())
if ((msg->security & PGPINLINE) == PGPINLINE) {
/* they really want to send it inline... go for it */
if (!isendwin ())
for (i = 0; i < Context->vcount; i++) {
if (Context->hdrs[Context->v2r[i]]->tagged) {
mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
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 & APPLICATION_PGP) {
mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
M_CM_DECODE | M_CM_CHARCONV, 0);
if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_PGP) {
mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
M_CM_DECODE | M_CM_CHARCONV, 0);
- if (!(h->security & ENCRYPT && !crypt_valid_passphrase (h->security))) {
- if (h->security & APPLICATION_PGP) {
- mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
- fflush (fpout);
- mutt_endwin (_("Trying to extract PGP keys...\n"));
- crypt_pgp_invoke_import (tempfname);
- }
+ if (h->security & APPLICATION_PGP) {
+ mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
+ fflush (fpout);
+ mutt_endwin (_("Trying to extract PGP keys...\n"));
+ crypt_pgp_invoke_import (tempfname);
+ }
- if (h->security & APPLICATION_SMIME) {
- if (h->security & ENCRYPT)
- mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
- | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
- else
- mutt_copy_message (fpout, Context, h, 0, 0);
-
- fflush (fpout);
- if (h->env->from)
- tmp = mutt_expand_aliases (h->env->from);
- else if (h->env->sender)
- tmp = mutt_expand_aliases (h->env->sender);
- mbox = tmp ? tmp->mailbox : NULL;
- if (mbox) { /* else ? */
- mutt_message (_("Trying to extract S/MIME certificates...\n"));
- crypt_smime_invoke_import (tempfname, mbox);
- }
+ if (h->security & APPLICATION_SMIME) {
+ if (h->security & ENCRYPT)
+ mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
+ | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
+ else
+ mutt_copy_message (fpout, Context, h, 0, 0);
+
+ fflush (fpout);
+ if (h->env->from)
+ tmp = mutt_expand_aliases (h->env->from);
+ else if (h->env->sender)
+ tmp = mutt_expand_aliases (h->env->sender);
+ mbox = tmp ? tmp->mailbox : NULL;
+ if (mbox) { /* else ? */
+ mutt_message (_("Trying to extract S/MIME certificates...\n"));
+ crypt_smime_invoke_import (tempfname, mbox);