dvn
/
pEpEngine
forked from pEp.foundation/pEpEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

API change, #1: _mime_encode_message_internal is now gone. mime_encode_message has 4th argument indicating that the first attachment is an embedded pEp message and it should be processed accordingly.

Browse Source
install_headers
Krista 'DarthMama' Bennett 3 years ago
parent ad341df56d
commit 2da08f15fb
17 changed files with 75 additions and 86 deletions
Show Stats Download Patch File Download Diff File

15
src/aux_mime_msg.c
Unescape Escape View File

@ -120,7 +120,7 @@ DYNAMIC_API PEP_STATUS MIME_decrypt_message(
}
if (*flags & PEP_decrypt_flag_src_modified) {
_mime_encode_message_internal(tmp_msg, false, modified_src, false);
mime_encode_message(tmp_msg, false, modified_src, false);
if (!modified_src) {
*flags &= (~PEP_decrypt_flag_src_modified);
decrypt_status = PEP_CANNOT_REENCRYPT; // Because we couldn't return it, I guess.
@ -128,7 +128,7 @@ DYNAMIC_API PEP_STATUS MIME_decrypt_message(
}
// FIXME: test with att
status = _mime_encode_message_internal(dec_msg, false, mime_plaintext, false);
status = mime_encode_message(dec_msg, false, mime_plaintext, false);
if (status == PEP_STATUS_OK)
{
@ -217,11 +217,10 @@ DYNAMIC_API PEP_STATUS MIME_encrypt_message(
goto pEp_error;
}
tmp_status = _mime_encode_message_internal(
ret_msg,
false,
mime_ciphertext,
false);
tmp_status = mime_encode_message(ret_msg,
false,
mime_ciphertext,
false);
if (tmp_status != PEP_STATUS_OK)
status = tmp_status;
@ -270,7 +269,7 @@ DYNAMIC_API PEP_STATUS MIME_encrypt_message_for_self(
goto pEp_error;
}
status = mime_encode_message(enc_msg, false, mime_ciphertext);
status = mime_encode_message(enc_msg, false, mime_ciphertext, false);
pEp_error:
free_message(tmp_msg);

12
src/etpan_mime.c
Unescape Escape View File

@ -1746,7 +1746,7 @@ static PEP_STATUS mime_encode_message_plain(
const message *msg,
bool omit_fields,
struct mailmime **result,
bool contains_non_fwd_msg_att
bool has_pEp_msg_attachment
)
{
struct mailmime * mime = NULL;
@ -1859,7 +1859,7 @@ static PEP_STATUS mime_encode_message_plain(
continue;
// solely for readability.
bool is_pEp_msg_attachment = (first_one && contains_non_fwd_msg_att);
bool is_pEp_msg_attachment = (first_one && has_pEp_msg_attachment);
status = mime_attachment(_a, &submime,
is_pEp_msg_attachment);
@ -1975,11 +1975,11 @@ enomem:
return status;
}
PEP_STATUS _mime_encode_message_internal(
DYNAMIC_API PEP_STATUS mime_encode_message(
const message * msg,
bool omit_fields,
char **mimetext,
bool set_attachment_forward_comment
bool has_pEp_msg_attachment
)
{
PEP_STATUS status = PEP_STATUS_OK;
@ -1999,10 +1999,10 @@ PEP_STATUS _mime_encode_message_internal(
switch (msg->enc_format) {
case PEP_enc_none:
status = mime_encode_message_plain(msg, omit_fields, &mime, set_attachment_forward_comment);
status = mime_encode_message_plain(msg, omit_fields, &mime, has_pEp_msg_attachment);
break;
// I'm presuming we should hardcore ignoring set_attachment_forward_comment here...
// I'm presuming we should hardcore ignoring has_pEp_msg_attachment here...
case PEP_enc_inline:
status = mime_encode_message_plain(msg, omit_fields, &mime, false);
break;

4
src/message_api.c
Unescape Escape View File

@ -921,7 +921,7 @@ static message* wrap_message_as_attachment(message* envelope,
);
/* Turn message into a MIME-blob */
status = _mime_encode_message_internal(attachment, false, &message_text, false);
status = mime_encode_message(attachment, false, &message_text, false);
if (status != PEP_STATUS_OK)
goto enomem;
@ -1028,7 +1028,7 @@ static PEP_STATUS encrypt_PGP_MIME(
_src->enc_format = PEP_enc_none;
bool wrapped = (wrap_type != PEP_message_unwrapped);
status = _mime_encode_message_internal(_src, true, &mimetext, wrapped);
status = mime_encode_message(_src, true, &mimetext, wrapped);
assert(status == PEP_STATUS_OK);
if (status != PEP_STATUS_OK)
goto pEp_error;

9
src/mime.c
Unescape Escape View File

@ -32,12 +32,3 @@ DYNAMIC_API bool is_PGP_message_text(const char *text)
return strncmp(text, "-----BEGIN PGP MESSAGE-----", 27) == 0;
}
DYNAMIC_API PEP_STATUS mime_encode_message(
const message * msg,
bool omit_fields,
char **mimetext
)
{
return _mime_encode_message_internal(msg, omit_fields, mimetext, false);
}

30
src/mime.h
Unescape Escape View File

@ -23,9 +23,21 @@ DYNAMIC_API bool is_PGP_message_text(const char *text);
// mime_encode_message() - encode a MIME message
//
// parameters:
// msg (in) message to encode
// omit_fields (in) only encode message body and attachments
// mimetext (out) the resulting encoded text or NULL on any error
// msg (in) message to encode
// omit_fields (in) only encode message body and
// attachments
// mimetext (out) the resulting encoded text or
// NULL on any error
// has_pEp_msg_attachment (in) is the first *attachment* to this
// message an embedded pEp message
// which needs appropriate marking
// (forwarded=no, etc) and encoding?
// (this argument is internal to
// pEp and should almost
// ALWAYS be false when used
// by external callers, including
// adapters!!!)
//
//
// return value:
// PEP_STATUS_OK if everything worked
@ -48,7 +60,8 @@ DYNAMIC_API bool is_PGP_message_text(const char *text);
DYNAMIC_API PEP_STATUS mime_encode_message(
const message * msg,
bool omit_fields,
char **mimetext
char **mimetext,
bool has_pEp_msg_attachment
);
@ -86,15 +99,6 @@ PEP_STATUS _mime_decode_message_internal(
bool* raise_msg_attachment
);
/* sometimes we don't want to transport encode */
PEP_STATUS _mime_encode_message_internal(
const message * msg,
bool omit_fields,
char **mimetext,
bool set_attachment_forward_comment
);
#ifdef __cplusplus
}
#endif

2
test/src/DecorateTest.cc
Unescape Escape View File

@ -129,7 +129,7 @@ TEST_F(DecorateTest, check_decorate) {
ASSERT_NE(encrypted_msg, nullptr);
output_stream << "message encrypted.\n";
status = mime_encode_message(encrypted_msg, false, &encoded_text);
status = mime_encode_message(encrypted_msg, false, &encoded_text, false);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);

16
test/src/EmptyLongmsgFullHtmlTest.cc
Unescape Escape View File

@ -133,7 +133,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_NULL) {
msg->shortmsg = strdup("Eat Moar Cheese");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
cout << outmsg << endl;
@ -157,7 +157,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_text_att) {
msg->attachments = new_bloblist(text_att, strlen(text_att), "text/plain", NULL);
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
ASSERT_EQ(strstr(outmsg, "alternative"), nullptr);
@ -183,7 +183,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_html_att) {
msg->attachments = new_bloblist(text_att, strlen(text_att), "text/plain", NULL);
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
ASSERT_EQ(strstr(outmsg, "alternative"), nullptr);
ASSERT_EQ(strstr(outmsg, "related"), nullptr);
@ -213,7 +213,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_text_html_atts) {
bloblist_add(msg->attachments, html_att, strlen(html_att), "text/html", "stupid_msg.html");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
// Could do more here, but honestly, these are just sanity checks, as mostly this is getting checked by inspection
ASSERT_EQ(strstr(outmsg, "alternative"), nullptr);
@ -255,7 +255,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_html_text_atts) {
msg->attachments->next = new_bloblist(text_att, strlen(text_att), "text/plain", "blargh.txt");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
cout << outmsg << endl;
@ -293,7 +293,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_text_empty) {
msg->longmsg = strdup("");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
cout << outmsg << endl;
@ -338,7 +338,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_text_inline_att)
msg->attachments = new_bloblist(img, img_size, "image/jpeg", "cid://part1.21156198.7E41C8BF@darthmama.org");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
ASSERT_EQ(strstr(outmsg, "alternative"), nullptr);
ASSERT_NE(strstr(outmsg, "related"), nullptr);
@ -388,7 +388,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_empty_longmsg_full_html_text_inline_att_p
bloblist_add(msg->attachments, img, img_size, "image/jpeg", "meow.jpg");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
ASSERT_EQ(strstr(outmsg, "alternative"), nullptr);
ASSERT_NE(strstr(outmsg, "related"), nullptr);

2
test/src/EncryptAttachPrivateKeyTest.cc
Unescape Escape View File

@ -346,7 +346,7 @@ TEST_F(EncryptAttachPrivateKeyTest, check_encrypt_attach_private_key) {
output_stream << "Correctly encrypted message:" << endl << endl;
char* encrypted_msg_text = NULL;
mime_encode_message(enc_same_addr_same_uid_trusted, false, &encrypted_msg_text);
mime_encode_message(enc_same_addr_same_uid_trusted, false, &encrypted_msg_text, false);
output_stream << encrypted_msg_text << endl << endl;
// FIXME: Free all the damned things

4
test/src/EncryptForIdentityTest.cc
Unescape Escape View File

@ -133,7 +133,7 @@ TEST_F(EncryptForIdentityTest, check_encrypt_for_identity) {
output_stream << "message created.\n";
char* encoded_text = nullptr;
PEP_STATUS status = mime_encode_message(outgoing_message, false, &encoded_text);
PEP_STATUS status = mime_encode_message(outgoing_message, false, &encoded_text, false);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);
@ -150,7 +150,7 @@ TEST_F(EncryptForIdentityTest, check_encrypt_for_identity) {
ASSERT_NE(encrypted_msg, nullptr);
output_stream << "message encrypted.\n";
status = mime_encode_message(encrypted_msg, false, &encoded_text);
status = mime_encode_message(encrypted_msg, false, &encoded_text, false);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);

16
test/src/Engine514Test.cc
Unescape Escape View File

@ -92,7 +92,7 @@ TEST_F(Engine514Test, check_engine514_unencrypted) {
not_the_msg->shortmsg = strdup("This is an ATTACHMENT");
not_the_msg->longmsg = strdup("Some body text here.");
mime_encode_message(not_the_msg, false, &attachment_text);
mime_encode_message(not_the_msg, false, &attachment_text, false);
ASSERT_NE(attachment_text, nullptr);
free_message(not_the_msg);
@ -120,7 +120,7 @@ TEST_F(Engine514Test, check_engine514_unencrypted) {
// Funny, it's not reproduceable here.
char* output_str = NULL;
mime_encode_message(msg, false, &output_str);
mime_encode_message(msg, false, &output_str, false);
char* find_the_mimetype = strstr(output_str, "message/rfc822");
ASSERT_NE(find_the_mimetype, nullptr);
find_the_mimetype = strstr(output_str, "text/rfc822");
@ -143,7 +143,7 @@ TEST_F(Engine514Test, check_engine514_unencrypted_second_position) {
not_the_msg->shortmsg = strdup("This is an ATTACHMENT");
not_the_msg->longmsg = strdup("Some body text here.");
mime_encode_message(not_the_msg, false, &attachment_text);
mime_encode_message(not_the_msg, false, &attachment_text, false);
ASSERT_NE(attachment_text, nullptr);
free_message(not_the_msg);
@ -173,7 +173,7 @@ TEST_F(Engine514Test, check_engine514_unencrypted_second_position) {
// Still not reproduceable
char* output_str = NULL;
mime_encode_message(msg, false, &output_str);
mime_encode_message(msg, false, &output_str, false);
cout << output_str << endl;
char* find_the_mimetype = strstr(output_str, "message/rfc822");
ASSERT_NE(find_the_mimetype, nullptr);
@ -192,7 +192,7 @@ TEST_F(Engine514Test, check_engine514_encode_and_decode) {
not_the_msg->shortmsg = strdup("This is an ATTACHMENT");
not_the_msg->longmsg = strdup("Some body text here.");
mime_encode_message(not_the_msg, false, &attachment_text);
mime_encode_message(not_the_msg, false, &attachment_text, false);
ASSERT_NE(attachment_text, nullptr);
free_message(not_the_msg);
@ -213,7 +213,7 @@ TEST_F(Engine514Test, check_engine514_encode_and_decode) {
msg->attachments = new_bloblist(attachment_text, strlen(attachment_text), "message/rfc822", NULL);
char* output_str = NULL;
mime_encode_message(msg, false, &output_str);
mime_encode_message(msg, false, &output_str, false);
cout << output_str << endl;
char* find_the_mimetype = strstr(output_str, "message/rfc822");
ASSERT_NE(find_the_mimetype, nullptr);
@ -239,7 +239,7 @@ TEST_F(Engine514Test, check_engine514_encrypted) {
not_the_msg->shortmsg = strdup("This is an ATTACHMENT");
not_the_msg->longmsg = strdup("Some body text here.");
mime_encode_message(not_the_msg, false, &attachment_text);
mime_encode_message(not_the_msg, false, &attachment_text, false);
ASSERT_NE(attachment_text, nullptr);
free_message(not_the_msg);
@ -276,7 +276,7 @@ TEST_F(Engine514Test, check_engine514_encrypted) {
// Funny, it's not reproduceable here.
// char* output_str = NULL;
// mime_encode_message(msg, false, &output_str);
// mime_encode_message(msg, false, &output_str, false);
// char* find_the_mimetype = strstr(output_str, "message/rfc822");
// ASSERT_NE(find_the_mimetype, nullptr);
// find_the_mimetype = strstr(output_str, "text/rfc822");

18
test/src/KeyResetMessageTest.cc
Unescape Escape View File

@ -217,7 +217,7 @@ class KeyResetMessageTest : public ::testing::Test {
ASSERT_NE(enc_outgoing_msg, nullptr);
output_stream << "Message encrypted.\n";
char* outstring = NULL;
mime_encode_message(enc_outgoing_msg, false, &outstring);
mime_encode_message(enc_outgoing_msg, false, &outstring, false);
output_stream << outstring << endl;
free_message(enc_outgoing_msg);
free(outstring);
@ -350,7 +350,7 @@ TEST_F(KeyResetMessageTest, check_reset_key_and_notify) {
ofstream outfile;
outfile.open("test_files/398_reset_from_alice_to_bob.eml");
char* bob_msg = NULL;
mime_encode_message(curr_sent_msg, false, &bob_msg);
mime_encode_message(curr_sent_msg, false, &bob_msg, false);
outfile << bob_msg;
outfile.close();
}
@ -358,7 +358,7 @@ TEST_F(KeyResetMessageTest, check_reset_key_and_notify) {
ofstream outfile;
outfile.open("test_files/398_reset_from_alice_to_fenris.eml");
char* fenris_msg = NULL;
mime_encode_message(curr_sent_msg, false, &fenris_msg);
mime_encode_message(curr_sent_msg, false, &fenris_msg, false);
outfile << fenris_msg;
outfile.close();
}
@ -656,7 +656,7 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own) {
outfile.open("test_mails/check_reset_grouped_own_recv.eml");
message* curr_sent_msg = m_queue.at(0);
char* msg_txt = NULL;
mime_encode_message(curr_sent_msg, false, &msg_txt);
mime_encode_message(curr_sent_msg, false, &msg_txt, false);
outfile << msg_txt;
outfile.close();
cout << " ASSERT_STREQ(alice->fpr, \"" << alice_new_fpr << "\");" << endl;
@ -814,7 +814,7 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own_multi_ident_one_fpr) {
string fname = "test_mails/check_reset_grouped_own_multi_ident_one_fpr.eml";
outfile.open(fname);
char* msg_txt = NULL;
mime_encode_message(curr_sent_msg, false, &msg_txt);
mime_encode_message(curr_sent_msg, false, &msg_txt, false);
outfile << msg_txt;
outfile.close();
cout << " // check_reset_grouped_own_multi_ident_one_fpr_recv" << endl;
@ -1032,7 +1032,7 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own_multiple_keys_multiple_ident
string fname = string("test_mails/check_reset_grouped_own_multiple_keys_multiple_idents_reset_all_") + to_string(i) + ".eml";
outfile.open(fname);
char* msg_txt = NULL;
mime_encode_message(curr_sent_msg, false, &msg_txt);
mime_encode_message(curr_sent_msg, false, &msg_txt, false);
outfile << msg_txt;
outfile.close();
}
@ -1161,7 +1161,7 @@ TEST_F(KeyResetMessageTest, check_reset_all_own_grouped) {
string fname = string("test_mails/check_reset_all_own_grouped") + to_string(i) + ".eml";
outfile.open(fname);
char* msg_txt = NULL;
mime_encode_message(curr_sent_msg, false, &msg_txt);
mime_encode_message(curr_sent_msg, false, &msg_txt, false);
outfile << msg_txt;
outfile.close();
}
@ -1495,7 +1495,7 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own_multiple_keys_multiple_ident
string fname = "test_mails/check_reset_grouped_own_multiple_keys_multiple_idents_reset_one.eml";
outfile.open(fname);
char* msg_txt = NULL;
mime_encode_message(curr_sent_msg, false, &msg_txt);
mime_encode_message(curr_sent_msg, false, &msg_txt, false);
outfile << msg_txt;
outfile.close();
cout << " // check_reset_grouped_own_multiple_keys_multiple_idents_reset_one_recv" << endl;
@ -2320,7 +2320,7 @@ TEST_F(KeyResetMessageTest, not_a_test) {
status = encrypt_message(session, bob_msg, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
ASSERT_EQ(status, PEP_STATUS_OK);
status = mime_encode_message(enc_msg, false, &enc_msg_str);
status = mime_encode_message(enc_msg, false, &enc_msg_str, false);
ofstream myfile;
myfile.open("test_mails/ENGINE-654_bob_mail.eml");

4
test/src/MessageApiTest.cc
Unescape Escape View File

@ -117,7 +117,7 @@ TEST_F(MessageApiTest, check_message_api) {
output_stream << "message created.\n";
char *text2 = nullptr;
PEP_STATUS status2 = mime_encode_message(msg2, false, &text2);
PEP_STATUS status2 = mime_encode_message(msg2, false, &text2, false);
ASSERT_EQ(status2 , PEP_STATUS_OK);
ASSERT_NE(text2, nullptr);
@ -135,7 +135,7 @@ TEST_F(MessageApiTest, check_message_api) {
ASSERT_NE(enc_msg2, nullptr);
output_stream << "message encrypted.\n";
status2 = mime_encode_message(enc_msg2, false, &text2);
status2 = mime_encode_message(enc_msg2, false, &text2, false);
ASSERT_EQ(status2 , PEP_STATUS_OK);
ASSERT_NE(text2, nullptr);

6
test/src/MessageTwoPointOhTest.cc
Unescape Escape View File

@ -142,7 +142,7 @@ TEST_F(MessageTwoPointOhTest, check_message_two_point_oh) {
output_stream << "message created.\n";
char* encoded_text = nullptr;
status = mime_encode_message(outgoing_message, false, &encoded_text);
status = mime_encode_message(outgoing_message, false, &encoded_text, false);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);
@ -162,7 +162,7 @@ TEST_F(MessageTwoPointOhTest, check_message_two_point_oh) {
output_stream << "message encrypted.\n";
encrypted_msg->enc_format = PEP_enc_none;
status = mime_encode_message(encrypted_msg, false, &encoded_text);
status = mime_encode_message(encrypted_msg, false, &encoded_text, false);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);
@ -217,7 +217,7 @@ TEST_F(MessageTwoPointOhTest, check_message_two_point_oh) {
}
decrypted_msg->enc_format = PEP_enc_none;
status = _mime_encode_message_internal(decrypted_msg, false, &encoded_text, false);
status = mime_encode_message(decrypted_msg, false, &encoded_text, false);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(encoded_text, nullptr);
output_stream << "Decrypted message: " << endl;

2
test/src/MimeTest.cc
Unescape Escape View File

@ -147,7 +147,7 @@ TEST_F(MimeTest, check_mime) {
output_stream << "encoding message…\n";
char *result2;
PEP_STATUS status2 = mime_encode_message(msg2, false, &result2);
PEP_STATUS status2 = mime_encode_message(msg2, false, &result2, false);
ASSERT_NE(result2, nullptr);
ASSERT_EQ(status2, PEP_STATUS_OK);

2
test/src/SenderFPRTest.cc
Unescape Escape View File

@ -129,7 +129,7 @@ TEST_F(SenderFPRTest, check_sender_f_p_r) {
ASSERT_EQ(status , PEP_STATUS_OK);
char* text = NULL;
mime_encode_message(dec_msg, false, &text);
mime_encode_message(dec_msg, false, &text, false);
output_stream << text << endl;
free(text);

6
test/src/UnencryptedPepMailTest.cc
Unescape Escape View File

@ -120,7 +120,7 @@ PEP_STATUS set_up_preset(PEP_SESSION session,
ASSERT_TRUE(is_pEpmsg(msg));
// char* outmsg = NULL;
// mime_encode_message(msg, false, &outmsg);
// mime_encode_message(msg, false, &outmsg, false);
// ofstream outfile;
// outfile.open("tmp/unenc_pep_msg_test_1.eml");
// outfile << outmsg;
@ -161,7 +161,7 @@ PEP_STATUS set_up_preset(PEP_SESSION session,
"I do not want a cup of 'Hoffee', and you are not singlehandedly\n"
"responsible for bringing down the Berlin Wall.\n\nGo away. - Alice");
char* outmsg = NULL;
mime_encode_message(msg, false, &outmsg);
mime_encode_message(msg, false, &outmsg, false);
char* encmsg = NULL;
status = MIME_encrypt_message(session, outmsg, strlen(outmsg), NULL, &encmsg, PEP_enc_PGP_MIME, 0);
@ -174,7 +174,7 @@ PEP_STATUS set_up_preset(PEP_SESSION session,
ASSERT_NE(encmsg, nullptr);
// char* outmsg = NULL;
// mime_encode_message(msg, false, &outmsg);
// mime_encode_message(msg, false, &outmsg, false);
// ofstream outfile;
// outfile.open("tmp/unenc_pep_msg_test_1.eml");
// outfile << outmsg;

13
test/src/test_util.cc
Unescape Escape View File

@ -593,7 +593,7 @@ PEP_STATUS MIME_decrypt_message(
}
if (*flags & PEP_decrypt_flag_src_modified) {
_mime_encode_message_internal(tmp_msg, false, modified_src, false);
mime_encode_message(tmp_msg, false, modified_src, false);
if (!modified_src) {
*flags &= (~PEP_decrypt_flag_src_modified);
decrypt_status = PEP_CANNOT_REENCRYPT; // Because we couldn't return it, I guess.
@ -601,7 +601,7 @@ PEP_STATUS MIME_decrypt_message(
}
// FIXME: test with att
status = _mime_encode_message_internal(dec_msg, false, mime_plaintext, false);
status = mime_encode_message(dec_msg, false, mime_plaintext, false);
if (status == PEP_STATUS_OK)
{
@ -689,12 +689,7 @@ PEP_STATUS MIME_encrypt_message(
goto pEp_error;
}
tmp_status = _mime_encode_message_internal(
ret_msg,
false,
mime_ciphertext,
false);
tmp_status = mime_encode_message(ret_msg, false, mime_ciphertext, false);
if (tmp_status != PEP_STATUS_OK)
status = tmp_status;
@ -742,7 +737,7 @@ PEP_STATUS MIME_encrypt_message_for_self(
goto pEp_error;
}
status = mime_encode_message(enc_msg, false, mime_ciphertext);
status = mime_encode_message(enc_msg, false, mime_ciphertext, false);
pEp_error:
free_message(tmp_msg);

Write Preview
Loading…
Cancel
Save