Attachment #145259 for bug #212272

View | Details | Raw Unified | Return to bug 212272
Collapse All | Expand All




	opart = camel_mime_part_new();
	valid = camel_cipher_decrypt(context, part, opart, ex);
	if (valid == NULL) {
		em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
		em_format_part_as(emf, stream, part, NULL);
	} else {
		if (emfc == NULL)

	if (valid == NULL) {
		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
		if (ex->desc)
			em_format_format_error(emf, stream, "%s", ex->desc);
		em_format_part_as(emf, stream, part, "multipart/mixed");
	} else {
		if (emfc == NULL)

		if (valid == NULL) {
			em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
			if (ex->desc)
				em_format_format_error(emf, stream, "%s", ex->desc);
			em_format_part_as(emf, stream, part, "multipart/mixed");
		} else {
			if (emfc == NULL)

	if (!valid) {
		em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
		if (ex->desc)
			em_format_format_error(emf, stream, "%s", ex->desc);
		em_format_format_source(emf, stream, ipart);
		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
		camel_exception_free(ex);

	if (!valid) {
		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
		if (ex->desc)
			em_format_format_error(emf, stream, "%s", ex->desc);
		em_format_format_source(emf, stream, ipart);
		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
		camel_exception_free(ex);

Return to bug 212272

Lines 1193-1199 emf_application_xpkcs7mime(EMFormat *emf Link Here

(-)mail/em-format.c (-5 / +5 lines)
1193	opart = camel_mime_part_new();	1193	opart = camel_mime_part_new();
1194	valid = camel_cipher_decrypt(context, part, opart, ex);	1194	valid = camel_cipher_decrypt(context, part, opart, ex);
1195	if (valid == NULL) {	1195	if (valid == NULL) {
1196	em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));	1196	em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
1197	em_format_part_as(emf, stream, part, NULL);	1197	em_format_part_as(emf, stream, part, NULL);
1198	} else {	1198	} else {
1199	if (emfc == NULL)	1199	if (emfc == NULL)
Lines 1350-1356 emf_multipart_encrypted(EMFormat *emf, C Link Here
1350	if (valid == NULL) {	1350	if (valid == NULL) {
1351	em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));	1351	em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
1352	if (ex->desc)	1352	if (ex->desc)
1353	em_format_format_error(emf, stream, ex->desc);	1353	em_format_format_error(emf, stream, "%s", ex->desc);
1354	em_format_part_as(emf, stream, part, "multipart/mixed");	1354	em_format_part_as(emf, stream, part, "multipart/mixed");
1355	} else {	1355	} else {
1356	if (emfc == NULL)	1356	if (emfc == NULL)
Lines 1515-1521 emf_multipart_signed(EMFormat *emf, Came Link Here
1515	if (valid == NULL) {	1515	if (valid == NULL) {
1516	em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));	1516	em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
1517	if (ex->desc)	1517	if (ex->desc)
1518	em_format_format_error(emf, stream, ex->desc);	1518	em_format_format_error(emf, stream, "%s", ex->desc);
1519	em_format_part_as(emf, stream, part, "multipart/mixed");	1519	em_format_part_as(emf, stream, part, "multipart/mixed");
1520	} else {	1520	} else {
1521	if (emfc == NULL)	1521	if (emfc == NULL)
Lines 1586-1592 emf_inlinepgp_signed(EMFormat *emf, Came Link Here
1586	if (!valid) {	1586	if (!valid) {
1587	em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));	1587	em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
1588	if (ex->desc)	1588	if (ex->desc)
1589	em_format_format_error(emf, stream, ex->desc);	1589	em_format_format_error(emf, stream, "%s", ex->desc);
1590	em_format_format_source(emf, stream, ipart);	1590	em_format_format_source(emf, stream, ipart);
1591	/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */	1591	/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
1592	camel_exception_free(ex);	1592	camel_exception_free(ex);
Lines 1658-1664 emf_inlinepgp_encrypted(EMFormat *emf, C Link Here
1658	if (!valid) {	1658	if (!valid) {
1659	em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));	1659	em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
1660	if (ex->desc)	1660	if (ex->desc)
1661	em_format_format_error(emf, stream, ex->desc);	1661	em_format_format_error(emf, stream, "%s", ex->desc);
1662	em_format_format_source(emf, stream, ipart);	1662	em_format_format_source(emf, stream, ipart);
1663	/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */	1663	/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
1664	camel_exception_free(ex);	1664	camel_exception_free(ex);