|
Lines 1193-1199
emf_application_xpkcs7mime(EMFormat *emf
|
Link Here
|
|---|
|
opart = camel_mime_part_new(); | opart = camel_mime_part_new(); |
valid = camel_cipher_decrypt(context, part, opart, ex); | valid = camel_cipher_decrypt(context, part, opart, ex); |
if (valid == NULL) { | if (valid == NULL) { |
em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); |
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); | em_format_part_as(emf, stream, part, NULL); |
} else { | } else { |
if (emfc == NULL) | if (emfc == NULL) |
|
Lines 1350-1356
emf_multipart_encrypted(EMFormat *emf, C
|
Link Here
|
|---|
|
if (valid == 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")); | 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) | if (ex->desc) |
em_format_format_error(emf, stream, ex->desc); |
em_format_format_error(emf, stream, "%s", ex->desc); |
em_format_part_as(emf, stream, part, "multipart/mixed"); | em_format_part_as(emf, stream, part, "multipart/mixed"); |
} else { | } else { |
if (emfc == NULL) | if (emfc == NULL) |
|
Lines 1515-1521
emf_multipart_signed(EMFormat *emf, Came
|
Link Here
|
|---|
|
if (valid == NULL) { | if (valid == NULL) { |
em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); | em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); |
if (ex->desc) | if (ex->desc) |
em_format_format_error(emf, stream, ex->desc); |
em_format_format_error(emf, stream, "%s", ex->desc); |
em_format_part_as(emf, stream, part, "multipart/mixed"); | em_format_part_as(emf, stream, part, "multipart/mixed"); |
} else { | } else { |
if (emfc == NULL) | if (emfc == NULL) |
|
Lines 1586-1592
emf_inlinepgp_signed(EMFormat *emf, Came
|
Link Here
|
|---|
|
if (!valid) { | if (!valid) { |
em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); | em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); |
if (ex->desc) | if (ex->desc) |
em_format_format_error(emf, stream, ex->desc); |
em_format_format_error(emf, stream, "%s", ex->desc); |
em_format_format_source(emf, stream, ipart); | em_format_format_source(emf, stream, ipart); |
/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ | /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ |
camel_exception_free(ex); | camel_exception_free(ex); |
|
Lines 1658-1664
emf_inlinepgp_encrypted(EMFormat *emf, C
|
Link Here
|
|---|
|
if (!valid) { | if (!valid) { |
em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); | em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); |
if (ex->desc) | if (ex->desc) |
em_format_format_error(emf, stream, ex->desc); |
em_format_format_error(emf, stream, "%s", ex->desc); |
em_format_format_source(emf, stream, ipart); | em_format_format_source(emf, stream, ipart); |
/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ | /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ |
camel_exception_free(ex); | camel_exception_free(ex); |