Attachment #389038 for bug #348477




      t->d_filename = safe_strdup ("smime.p7s");
    }
  else
    {
      t->subtype = safe_strdup ("pgp-signature");
      t->use_disp = 0;
      t->disposition = DISPNONE;
      t->encoding = ENC7BIT;
      mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
      t->description = safe_strdup (PgpMimeSignatureDescription);
    }
  t->filename = sigfile;
  t->unlink = 1; /* ok to remove this file after sending. */

  return a;
}






WHERE ALIAS *Aliases INITVAL (0);
WHERE LIST *UserHeader INITVAL (0);

/*-- formerly in pgp.h --*/
WHERE REGEXP PgpGoodSign;
WHERE char *PgpSignAs;
WHERE short PgpTimeout;
WHERE char *PgpEntryFormat;
WHERE char *PgpMimeSignatureFilename;
WHERE char *PgpMimeSignatureDescription;
WHERE char *PgpClearSignCommand;
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
WHERE char *PgpDecryptCommand;
WHERE char *PgpSignCommand;
WHERE char *PgpEncryptSignCommand;
WHERE char *PgpEncryptOnlyCommand;
WHERE char *PgpImportCommand;




  ** .pp
  ** Also see the $$pgp_mime_auto variable.
  ** .pp
  ** Also note that using the old-style PGP message format is \fBstrongly\fP
  ** \fBdeprecated\fP.
  ** (PGP only)
  **
  */
  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
  /*
  ** .pp
  ** This option sets the filename used for signature parts in PGP/MIME
  ** signed messages.
  */
  { "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
  /*
  ** .pp
  ** This option sets the Content-Description used for signature parts in
  ** PGP/MIME signed messages.
  */
  { "pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, 0 },
  /*
  ** .pp
  ** If \fIset\fP, signed and encrypted messages will consist of nested
  ** \fCmultipart/signed\fP and \fCmultipart/encrypted\fP body parts.
  ** .pp
  ** This is useful for applications like encrypted and signed mailing
  ** lists, where the outer layer (\fCmultipart/encrypted\fP) can be easily




  t = t->parts->next;
  t->type = TYPEAPPLICATION;
  t->subtype = safe_strdup ("pgp-signature");
  t->filename = safe_strdup (sigfile);
  t->use_disp = 0;
  t->disposition = DISPNONE;
  t->encoding = ENC7BIT;
  t->unlink = 1; /* ok to remove this file after sending. */
  mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
  t->description = safe_strdup (PgpMimeSignatureDescription);

  return (a);
}

static short is_numerical_keyid (const char *s)
{
  /* or should we require the "0x"? */
  if (strncmp (s, "0x", 2) == 0)

Return to bug 348477

Lines 905-920 Link Here

(-)a/crypt-gpgme.c (+2 lines)
905	t->d_filename = safe_strdup ("smime.p7s");	905	t->d_filename = safe_strdup ("smime.p7s");
906	}	906	}
907	else	907	else
908	{	908	{
909	t->subtype = safe_strdup ("pgp-signature");	909	t->subtype = safe_strdup ("pgp-signature");
910	t->use_disp = 0;	910	t->use_disp = 0;
911	t->disposition = DISPNONE;	911	t->disposition = DISPNONE;
912	t->encoding = ENC7BIT;	912	t->encoding = ENC7BIT;
		913	mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
		914	t->description = safe_strdup (PgpMimeSignatureDescription);
913	}	915	}
914	t->filename = sigfile;	916	t->filename = sigfile;
915	t->unlink = 1; /* ok to remove this file after sending. */	917	t->unlink = 1; /* ok to remove this file after sending. */
916		918
917	return a;	919	return a;
918	}	920	}
919		921
920		922

Lines 223-238 Link Here

(-)a/globals.h (+2 lines)
223	WHERE ALIAS *Aliases INITVAL (0);	223	WHERE ALIAS *Aliases INITVAL (0);
224	WHERE LIST *UserHeader INITVAL (0);	224	WHERE LIST *UserHeader INITVAL (0);
225		225
226	/-- formerly in pgp.h --/	226	/-- formerly in pgp.h --/
227	WHERE REGEXP PgpGoodSign;	227	WHERE REGEXP PgpGoodSign;
228	WHERE char *PgpSignAs;	228	WHERE char *PgpSignAs;
229	WHERE short PgpTimeout;	229	WHERE short PgpTimeout;
230	WHERE char *PgpEntryFormat;	230	WHERE char *PgpEntryFormat;
		231	WHERE char *PgpMimeSignatureFilename;
		232	WHERE char *PgpMimeSignatureDescription;
231	WHERE char *PgpClearSignCommand;	233	WHERE char *PgpClearSignCommand;
232	WHERE char *PgpDecodeCommand;	234	WHERE char *PgpDecodeCommand;
233	WHERE char *PgpVerifyCommand;	235	WHERE char *PgpVerifyCommand;
234	WHERE char *PgpDecryptCommand;	236	WHERE char *PgpDecryptCommand;
235	WHERE char *PgpSignCommand;	237	WHERE char *PgpSignCommand;
236	WHERE char *PgpEncryptSignCommand;	238	WHERE char *PgpEncryptSignCommand;
237	WHERE char *PgpEncryptOnlyCommand;	239	WHERE char *PgpEncryptOnlyCommand;
238	WHERE char *PgpImportCommand;	240	WHERE char *PgpImportCommand;

Lines 1892-1907 Link Here

(-)a/init.h (+12 lines)
1892	** .pp	1892	** .pp
1893	** Also see the $$pgp_mime_auto variable.	1893	** Also see the $$pgp_mime_auto variable.
1894	** .pp	1894	** .pp
1895	** Also note that using the old-style PGP message format is \fBstrongly\fP	1895	** Also note that using the old-style PGP message format is \fBstrongly\fP
1896	** \fBdeprecated\fP.	1896	** \fBdeprecated\fP.
1897	** (PGP only)	1897	** (PGP only)
1898	**	1898	**
1899	*/	1899	*/
		1900	{ "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
		1901	/*
		1902	** .pp
		1903	** This option sets the filename used for signature parts in PGP/MIME
		1904	** signed messages.
		1905	*/
		1906	{ "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
		1907	/*
		1908	** .pp
		1909	** This option sets the Content-Description used for signature parts in
		1910	** PGP/MIME signed messages.
		1911	*/
1900	{ "pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, 0 },	1912	{ "pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, 0 },
1901	/*	1913	/*
1902	** .pp	1914	** .pp
1903	** If \fIset\fP, signed and encrypted messages will consist of nested	1915	** If \fIset\fP, signed and encrypted messages will consist of nested
1904	** \fCmultipart/signed\fP and \fCmultipart/encrypted\fP body parts.	1916	** \fCmultipart/signed\fP and \fCmultipart/encrypted\fP body parts.
1905	** .pp	1917	** .pp
1906	** This is useful for applications like encrypted and signed mailing	1918	** This is useful for applications like encrypted and signed mailing
1907	** lists, where the outer layer (\fCmultipart/encrypted\fP) can be easily	1919	** lists, where the outer layer (\fCmultipart/encrypted\fP) can be easily

Lines 1122-1137 Link Here

(-)a/pgp.c (+2 lines)
1122	t = t->parts->next;	1122	t = t->parts->next;
1123	t->type = TYPEAPPLICATION;	1123	t->type = TYPEAPPLICATION;
1124	t->subtype = safe_strdup ("pgp-signature");	1124	t->subtype = safe_strdup ("pgp-signature");
1125	t->filename = safe_strdup (sigfile);	1125	t->filename = safe_strdup (sigfile);
1126	t->use_disp = 0;	1126	t->use_disp = 0;
1127	t->disposition = DISPNONE;	1127	t->disposition = DISPNONE;
1128	t->encoding = ENC7BIT;	1128	t->encoding = ENC7BIT;
1129	t->unlink = 1; /* ok to remove this file after sending. */	1129	t->unlink = 1; /* ok to remove this file after sending. */
		1130	mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
		1131	t->description = safe_strdup (PgpMimeSignatureDescription);
1130		1132
1131	return (a);	1133	return (a);
1132	}	1134	}
1133		1135
1134	static short is_numerical_keyid (const char *s)	1136	static short is_numerical_keyid (const char *s)
1135	{	1137	{
1136	/* or should we require the "0x"? */	1138	/* or should we require the "0x"? */
1137	if (strncmp (s, "0x", 2) == 0)	1139	if (strncmp (s, "0x", 2) == 0)