ENGINE-741, ENGINE-742: mime_encode_message and mime_decode_message APIs changed, plus test suite upgrade. JSON Adapter and pEpMIME must adapt to this, as this breaks the former api!

install_headers decode-encode-API-change
parent 2da08f15fb
commit ea9a296836

@ -73,7 +73,7 @@ DYNAMIC_API PEP_STATUS MIME_decrypt_message(
message* dec_msg = NULL;
*mime_plaintext = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;
@ -161,7 +161,7 @@ DYNAMIC_API PEP_STATUS MIME_encrypt_message(
message* enc_msg = NULL;
message* ret_msg = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;
@ -248,7 +248,7 @@ DYNAMIC_API PEP_STATUS MIME_encrypt_message_for_self(
message* tmp_msg = NULL;
message* enc_msg = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;

@ -1006,7 +1006,7 @@ bool must_chunk_be_encoded(const void* value, size_t size, bool ignore_fws) {
static PEP_STATUS interpret_MIME(struct mailmime *mime,
message *msg,
bool* raise_msg_attachment);
bool* has_possible_pEp_msg);
// This function was rewritten to use in-memory buffers instead of
// temporary files when the pgp/mime support was implemented for
@ -2602,7 +2602,7 @@ static bool _is_marked_as_attachment(struct mailmime_fields *fields)
static PEP_STATUS interpret_MIME(
struct mailmime *mime,
message *msg,
bool* raise_msg_attachment
bool* has_possible_pEp_msg
)
{
PEP_STATUS status = PEP_STATUS_OK;
@ -2687,13 +2687,13 @@ static PEP_STATUS interpret_MIME(
return PEP_ILLEGAL_VALUE;
clistiter *cur;
// only add raise_msg_attachment on 2nd part!
// only add has_possible_pEp_msg on 2nd part!
int _att_count = 0;
for (cur = clist_begin(partlist); cur; cur = clist_next(cur), _att_count++) {
struct mailmime *part= clist_content(cur);
if (part == NULL)
return PEP_ILLEGAL_VALUE;
status = interpret_MIME(part, msg, _att_count == 1 ? raise_msg_attachment : NULL);
status = interpret_MIME(part, msg, _att_count == 1 ? has_possible_pEp_msg : NULL);
if (status != PEP_STATUS_OK)
return status;
}
@ -2730,7 +2730,7 @@ static PEP_STATUS interpret_MIME(
}
else {
// Fixme - we need a control on recursion level here - KG: maybe NOT. We only go to depth 1.
if (raise_msg_attachment != NULL) {
if (has_possible_pEp_msg != NULL) {
bool is_msg = (_is_message_part(content, "rfc822") || _is_text_part(content, "rfc822"));
if (is_msg) {
if (content->ct_parameters) {
@ -2740,7 +2740,7 @@ static PEP_STATUS interpret_MIME(
struct mailmime_parameter * param = clist_content(cur);
if (param && param->pa_name && strcasecmp(param->pa_name, "forwarded") == 0) {
if (param->pa_value && strcasecmp(param->pa_value, "no") == 0) {
*raise_msg_attachment = true;
*has_possible_pEp_msg = true;
break;
}
}
@ -2832,20 +2832,10 @@ enomem:
}
DYNAMIC_API PEP_STATUS mime_decode_message(
const char *mimetext,
size_t size,
message **msg
)
{
return _mime_decode_message_internal(mimetext, size, msg, NULL);
}
PEP_STATUS _mime_decode_message_internal(
const char *mimetext,
size_t size,
message **msg,
bool* raise_msg_attachment
bool* has_possible_pEp_msg
)
{
PEP_STATUS status = PEP_STATUS_OK;
@ -2889,7 +2879,7 @@ PEP_STATUS _mime_decode_message_internal(
if (content) {
status = interpret_MIME(mime->mm_data.mm_message.mm_msg_mime,
_msg, raise_msg_attachment);
_msg, has_possible_pEp_msg);
if (status != PEP_STATUS_OK)
goto pEp_error;
}

@ -3628,7 +3628,7 @@ static PEP_STATUS _decrypt_message(
case PEP_enc_PGP_MIME:
case PEP_enc_PGP_MIME_Outlook1:
status = _mime_decode_message_internal(ptext, psize, &msg, &has_inner);
status = mime_decode_message(ptext, psize, &msg, &has_inner);
if (status != PEP_STATUS_OK)
goto pEp_error;
@ -3763,7 +3763,8 @@ static PEP_STATUS _decrypt_message(
if (message_blob) {
status = mime_decode_message(message_blob->value,
message_blob->size,
&inner_message);
&inner_message,
NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;

@ -68,9 +68,16 @@ DYNAMIC_API PEP_STATUS mime_encode_message(
// mime_decode_message() - decode a MIME message
//
// parameters:
// mimetext (in) MIME encoded text to decode
// size (in) size of text to decode
// msg (out) decoded message
// mimetext (in) MIME encoded text to decode
// size (in) size of text to decode
// msg (out) decoded message
// has_possible_pEp_msg (inout) If non-NULL, will return
// true when the first attachment
// is a potential pEp message
// (mime-type = message/rfc822 and
// content-disposition parameter
// forwarded=no)
//
//
// return value:
// PEP_STATUS_OK if everything worked
@ -86,17 +93,10 @@ DYNAMIC_API PEP_STATUS mime_encode_message(
// will remain in the ownership of the caller
DYNAMIC_API PEP_STATUS mime_decode_message(
const char *mimetext,
size_t size,
message **msg
);
/* Carries extra return argument letting message api know if it needs to raise the attachment as 2.0/2.1 */
PEP_STATUS _mime_decode_message_internal(
const char *mimetext,
size_t size,
message **msg,
bool* raise_msg_attachment
bool* has_possible_pEp_msg
);
#ifdef __cplusplus

@ -123,7 +123,7 @@ TEST_F(AppleMailTest, check_apple_mail_text_signed_encrypted) {
PEP_decrypt_flags_t flags = 0;
message* final_ptr = nullptr;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
@ -185,7 +185,7 @@ TEST_F(AppleMailTest, check_apple_mail_html_signed_encrypted) {
const char* mailfile2 = "test_mails/apple_mail_TC_html_signed_encrypted.eml";
const string mailtext2 = slurp(mailfile2);
status = mime_decode_message(mailtext2.c_str(), mailtext2.length(), &msg_ptr);
status = mime_decode_message(mailtext2.c_str(), mailtext2.length(), &msg_ptr, NULL);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;

@ -142,7 +142,7 @@ TEST_F(BlacklistAcceptNewKeyTest, check_blacklist_accept_new_key) {
PEP_rating rating;
PEP_decrypt_flags_t flags = 0;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);

@ -403,7 +403,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_simple_html_only) {
string msg_str = slurp("test_mails/htmlonly_simple.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);
@ -417,7 +417,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_simple_html_text_attachment) {
string msg_str = slurp("test_mails/html_with_text_attachment.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);
@ -434,7 +434,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_simple_html_text_html_attachment) {
string msg_str = slurp("test_mails/htmlonly_simple_text_html.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);
@ -455,7 +455,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_simple_html_html_text_attachment) {
string msg_str = slurp("test_mails/htmlonly_simple_html_text.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_EQ(msg->longmsg, nullptr);
ASSERT_NE(msg->longmsg_formatted, nullptr);
@ -475,7 +475,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_simple_inline_html) {
string msg_str = slurp("test_mails/inlinecat.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);
@ -512,7 +512,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_inline_html_text_attachment) {
string msg_str = slurp("test_mails/htmlonlycatwtextatt.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);
@ -552,7 +552,7 @@ TEST_F(EmptyLongmsgFullHtmlTest, check_parse_inline_html_img_attachment) {
string msg_str = slurp("test_mails/htmlonlycatwithMOARCAT.eml");
message* msg = NULL;
int size = 0;
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg);
mime_decode_message(msg_str.c_str(), msg_str.size(), &msg, NULL);
ASSERT_NE(msg, nullptr);
ASSERT_EQ(msg->longmsg, nullptr);

@ -158,7 +158,7 @@ TEST_F(EncryptForIdentityTest, check_encrypt_for_identity) {
output_stream << encoded_text << "\n";
message* decoded_msg = nullptr;
status = mime_decode_message(encoded_text, strlen(encoded_text), &decoded_msg);
status = mime_decode_message(encoded_text, strlen(encoded_text), &decoded_msg, NULL);
ASSERT_EQ(status, PEP_STATUS_OK);
const string string3 = encoded_text;

@ -113,7 +113,7 @@ TEST_F(EncryptMissingPrivateKeyTest, check_encrypt_missing_private_key) {
const string mailtext = slurp("test_mails/blacklist_no_key.eml");
PEP_STATUS status = mime_decode_message(mailtext.c_str(), mailtext.length(), &tmp_msg);
PEP_STATUS status = mime_decode_message(mailtext.c_str(), mailtext.length(), &tmp_msg, NULL);
ASSERT_EQ(status, PEP_STATUS_OK);
status = update_identity(session, tmp_msg->from);

@ -221,7 +221,7 @@ TEST_F(Engine514Test, check_engine514_encode_and_decode) {
ASSERT_EQ(find_the_mimetype, nullptr);
message* checker = NULL;
mime_decode_message(output_str, strlen(output_str), &checker);
mime_decode_message(output_str, strlen(output_str), &checker, NULL);
ASSERT_STREQ(checker->attachments->mime_type, "message/rfc822");
}

@ -84,7 +84,7 @@ namespace {
TEST_F(Engine655Test, check_engine655) {
string msg_block = slurp("test_mails/655_msg_huss.eml");
message* msg = NULL;
PEP_STATUS status = mime_decode_message(msg_block.c_str(), msg_block.size(), &msg);
PEP_STATUS status = mime_decode_message(msg_block.c_str(), msg_block.size(), &msg, NULL);
for (int i = 0; i < 1; i++) {
char* ptext = NULL;
@ -138,7 +138,7 @@ TEST_F(Engine655Test, check_engine655) {
// // Let's see what this does...
// message* parse_verify;
// status = mime_decode_message(ptext, psize, &parse_verify);
// status = mime_decode_message(ptext, psize, &parse_verify, NULL);
//
keylist = NULL;
message* dec_msg = NULL;

@ -92,7 +92,7 @@ TEST_F(IOS1664Test, check_i_o_s1664) {
message* message_mail = NULL;
bool raise_att;
PEP_STATUS status = _mime_decode_message_internal(email.c_str(), email.size(), &message_mail, &raise_att);
PEP_STATUS status = mime_decode_message(email.c_str(), email.size(), &message_mail, &raise_att);
ASSERT_EQ(status , PEP_STATUS_OK && message_mail);
// create own identity here, because we want to reply, before we start.

@ -97,7 +97,7 @@ TEST_F(KeyAttachmentTest, check_key_attach_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -117,7 +117,7 @@ TEST_F(KeyAttachmentTest, check_key_plus_encr_att_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -143,7 +143,7 @@ TEST_F(KeyAttachmentTest, check_encr_att_plus_key_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -169,7 +169,7 @@ TEST_F(KeyAttachmentTest, check_key_plus_unencr_att_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -195,7 +195,7 @@ TEST_F(KeyAttachmentTest, check_unencr_att_plus_key_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -225,7 +225,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -245,7 +245,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_w_encr_file_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -271,7 +271,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_w_unencr_file_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -297,7 +297,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_with_many_files_inline) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -348,7 +348,7 @@ TEST_F(KeyAttachmentTest, check_key_attach_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -368,7 +368,7 @@ TEST_F(KeyAttachmentTest, check_key_plus_encr_att_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -393,7 +393,7 @@ TEST_F(KeyAttachmentTest, check_encr_att_plus_key_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -419,7 +419,7 @@ TEST_F(KeyAttachmentTest, check_key_plus_unencr_att_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -444,7 +444,7 @@ TEST_F(KeyAttachmentTest, check_unencr_att_plus_key_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -469,7 +469,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -489,7 +489,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_w_encr_file_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -514,7 +514,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_w_unencr_file_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;
@ -539,7 +539,7 @@ TEST_F(KeyAttachmentTest, check_many_keys_w_many_files_OpenPGP) {
message* enc_msg = NULL;
message* dec_msg = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg, nullptr);
stringlist_t* keylist = NULL;

@ -670,11 +670,11 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own) {
&ptext, &psize, &_keylist,
NULL);
message* inner_msg = NULL;
status = mime_decode_message(ptext, psize, &inner_msg);
status = mime_decode_message(ptext, psize, &inner_msg, NULL);
bloblist_t* key_reset_payload = inner_msg->attachments;
message* keyreset_msg = NULL;
status = mime_decode_message(key_reset_payload->value, key_reset_payload->size, &keyreset_msg);
status = mime_decode_message(key_reset_payload->value, key_reset_payload->size, &keyreset_msg, NULL);
keyreset_command_list* cl = NULL;
status = PER_to_key_reset_commands(keyreset_msg->attachments->value, keyreset_msg->attachments->size, &cl);
ASSERT_NE(cl, nullptr);
@ -896,7 +896,7 @@ TEST_F(KeyResetMessageTest, check_reset_grouped_own_multi_ident_one_fpr_recv) {
string fname = "test_mails/check_reset_grouped_own_multi_ident_one_fpr.eml";
string mailstr = slurp(fname.c_str());
message* new_msg = NULL;
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg);
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg, NULL);
ASSERT_NE(new_msg, nullptr);
ASSERT_EQ(status, PEP_STATUS_OK);
@ -1256,7 +1256,7 @@ TEST_F(KeyResetMessageTest, check_reset_all_own_grouped_recv) {
string fname = string("test_mails/check_reset_all_own_grouped") + to_string(i) + ".eml";
string mailstr = slurp(fname.c_str());
message* new_msg = NULL;
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg);
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg, NULL);
ASSERT_NE(new_msg, nullptr);
ASSERT_EQ(status, PEP_STATUS_OK);
@ -1359,7 +1359,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";
string mailstr = slurp(fname.c_str());
message* new_msg = NULL;
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg);
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg, NULL);
ASSERT_NE(new_msg, nullptr);
ASSERT_EQ(status, PEP_STATUS_OK);
@ -1577,7 +1577,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";
string mailstr = slurp(fname.c_str());
message* new_msg = NULL;
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg);
status = mime_decode_message(mailstr.c_str(), mailstr.size(), &new_msg, NULL);
ASSERT_NE(new_msg, nullptr);
ASSERT_EQ(status, PEP_STATUS_OK);
@ -2381,7 +2381,7 @@ TEST_F(KeyResetMessageTest, check_reset_mistrust_next_msg_have_not_mailed) {
// // Ok, so let's see if the thing is mistrusted
message* bob_enc_msg = NULL;
//
// mime_decode_message(mail_from_bob.c_str(), mail_from_bob.size(), &bob_enc_msg);
// mime_decode_message(mail_from_bob.c_str(), mail_from_bob.size(), &bob_enc_msg, NULL);
//
message* bob_dec_msg = NULL;
stringlist_t* keylist = NULL;
@ -2408,7 +2408,7 @@ TEST_F(KeyResetMessageTest, check_reset_mistrust_next_msg_have_not_mailed) {
//update_identity(session, bob);
// ASSERT_EQ(bob->fpr, nullptr);
mime_decode_message(mail_from_bob.c_str(), mail_from_bob.size(), &bob_enc_msg);
mime_decode_message(mail_from_bob.c_str(), mail_from_bob.size(), &bob_enc_msg, NULL);
bob_dec_msg = NULL;
free_stringlist(keylist);

@ -131,7 +131,7 @@ TEST_F(LeastColorGroupTest, check_least_color_group) {
PEP_rating rating;
PEP_decrypt_flags_t flags;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;

@ -130,7 +130,7 @@ TEST_F(LeastCommonDenomColorTest, check_least_common_denom_color) {
PEP_rating rating;
PEP_decrypt_flags_t flags;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
@ -179,7 +179,7 @@ TEST_F(LeastCommonDenomColorTest, check_least_common_denom_color) {
keylist = nullptr;
rating = PEP_rating_unreliable;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
flags = 0;

@ -143,7 +143,7 @@ TEST_F(MessageApiTest, check_message_api) {
output_stream << text2 << "\n";
message *msg3 = nullptr;
PEP_STATUS status3 = mime_decode_message(text2, strlen(text2), &msg3);
PEP_STATUS status3 = mime_decode_message(text2, strlen(text2), &msg3, NULL);
ASSERT_EQ(status3 , PEP_STATUS_OK);
const string string3 = text2;
//free(text2);
@ -195,7 +195,7 @@ TEST_F(MessageApiTest, check_message_api) {
inFile3.close();
message *msg5 = nullptr;
PEP_STATUS status5 = mime_decode_message(text3.c_str(), text3.length(), &msg5);
PEP_STATUS status5 = mime_decode_message(text3.c_str(), text3.length(), &msg5, NULL);
ASSERT_EQ(status5 , PEP_STATUS_OK);
message *msg6 = nullptr;

@ -183,7 +183,7 @@ TEST_F(MessageTwoPointOhTest, check_message_two_point_oh) {
// output_stream << decrypted_text << endl;
message* decoded_msg = nullptr;
status = mime_decode_message(encoded_text, strlen(encoded_text), &decoded_msg);
status = mime_decode_message(encoded_text, strlen(encoded_text), &decoded_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
const string string3 = encoded_text;

@ -93,7 +93,7 @@ namespace {
output_stream << "decoding message…\n";
message *msg3;
PEP_STATUS status3 = mime_decode_message(mimetext3.c_str(), mimetext3.length(), &msg3);
PEP_STATUS status3 = mime_decode_message(mimetext3.c_str(), mimetext3.length(), &msg3, NULL);
assert(status3 == PEP_STATUS_OK);
assert(msg3);
output_stream << "decoded.\n\n";

@ -123,7 +123,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
PEP_rating rating;
PEP_decrypt_flags_t flags;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -157,7 +157,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
keylist = nullptr;
rating = PEP_rating_unreliable;
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -191,7 +191,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_normal_signed_2a.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -224,7 +224,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/p3p_subject_normal_signed_2b.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -258,7 +258,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_encrypted_subject_IS_pEp_3a.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -292,7 +292,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/p3p_encrypted_subject_IS_pEp_3b.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -327,7 +327,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -361,7 +361,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -395,7 +395,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -429,7 +429,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -464,7 +464,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_unencrypted_pEp_subject_5a.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -499,7 +499,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_unencrypted_p3p_subject_5b.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;
@ -533,7 +533,7 @@ TEST_F(PepSubjectReceivedTest, check_pep_subject_received) {
mailtext = slurp("test_mails/pEp_subject_normal_unencrypted_6.eml");
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(msg_ptr, nullptr);
final_ptr = msg_ptr;

@ -179,13 +179,13 @@ TEST_F(ReencryptPlusExtraKeysTest, check_reencrypt_unencrypted_subj) {
ASSERT_NE(decrypted_text , nullptr);
ASSERT_NE(modified_src , nullptr);
message* checker = NULL;
status = mime_decode_message(modified_src, strlen(modified_src), &checker);
status = mime_decode_message(modified_src, strlen(modified_src), &checker, NULL);
ASSERT_NE(checker, nullptr);
ASSERT_STREQ(checker->shortmsg, "Boom shaka laka");
config_unencrypted_subject(session, false);
cout << modified_src << endl;
message* src_msg = NULL;
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg);
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg, NULL);
ASSERT_NE(src_msg, nullptr);
ASSERT_STREQ(src_msg->attachments->next->value, checker->attachments->next->value);
config_unencrypted_subject(session, false);
@ -226,12 +226,12 @@ TEST_F(ReencryptPlusExtraKeysTest, check_reencrypt_unencrypted_subj_check_effici
ASSERT_NE(decrypted_text , nullptr);
ASSERT_NE(modified_src , nullptr);
message* checker = NULL;
status = mime_decode_message(modified_src, strlen(modified_src), &checker);
status = mime_decode_message(modified_src, strlen(modified_src), &checker, NULL);
ASSERT_NE(checker, nullptr);
ASSERT_STREQ(checker->shortmsg, "Boom shaka laka");
cout << modified_src << endl;
message* src_msg = NULL;
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg);
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg, NULL);
ASSERT_NE(src_msg, nullptr);
ASSERT_STREQ(src_msg->attachments->next->value, checker->attachments->next->value);
@ -293,12 +293,12 @@ TEST_F(ReencryptPlusExtraKeysTest, check_reencrypt_unencrypted_subj_extra_keys)
ASSERT_NE(decrypted_text , nullptr);
ASSERT_NE(modified_src , nullptr);
message* checker = NULL;
status = mime_decode_message(modified_src, strlen(modified_src), &checker);
status = mime_decode_message(modified_src, strlen(modified_src), &checker, NULL);
ASSERT_NE(checker, nullptr);
ASSERT_STREQ(checker->shortmsg, "Boom shaka laka");
cout << modified_src << endl;
message* src_msg = NULL;
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg);
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg, NULL);
ASSERT_NE(src_msg, nullptr);
ASSERT_STRNE(src_msg->attachments->next->value, checker->attachments->next->value);
@ -376,12 +376,12 @@ TEST_F(ReencryptPlusExtraKeysTest, check_reencrypt_unencrypted_subj_extra_keys_e
ASSERT_NE(decrypted_text , nullptr);
ASSERT_NE(modified_src , nullptr);
message* checker = NULL;
status = mime_decode_message(modified_src, strlen(modified_src), &checker);
status = mime_decode_message(modified_src, strlen(modified_src), &checker, NULL);
ASSERT_NE(checker, nullptr);
ASSERT_STREQ(checker->shortmsg, "Boom shaka laka");
cout << modified_src << endl;
message* src_msg = NULL;
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg);
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg, NULL);
ASSERT_NE(src_msg, nullptr);
ASSERT_STRNE(src_msg->attachments->next->value, checker->attachments->next->value);
@ -447,12 +447,12 @@ TEST_F(ReencryptPlusExtraKeysTest, check_reencrypt_unencrypted_subj_extra_keys_e
ASSERT_NE(decrypted_text , nullptr);
ASSERT_NE(modified_src , nullptr);
message* checker = NULL;
status = mime_decode_message(modified_src, strlen(modified_src), &checker);
status = mime_decode_message(modified_src, strlen(modified_src), &checker, NULL);
ASSERT_NE(checker, nullptr);
ASSERT_STREQ(checker->shortmsg, "Boom shaka laka");
cout << modified_src << endl;
message* src_msg = NULL;
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg);
status = mime_decode_message(mailfile.c_str(), mailfile.size(), &src_msg, NULL);
ASSERT_NE(src_msg, nullptr);
ASSERT_STRNE(src_msg->attachments->next->value, checker->attachments->next->value);
@ -897,7 +897,7 @@ TEST_F(ReencryptPlusExtraKeysTest, check_efficient_reencrypt_from_enigmail) {
flags = PEP_decrypt_flag_untrusted_server;
// Put the original message into a message struct
status = mime_decode_message(to_reencrypt_from_enigmail.c_str(), to_reencrypt_from_enigmail.size(), &enc_msg);
status = mime_decode_message(to_reencrypt_from_enigmail.c_str(), to_reencrypt_from_enigmail.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg , nullptr);
@ -970,7 +970,7 @@ TEST_F(ReencryptPlusExtraKeysTest, check_efficient_reencrypt_from_enigmail_w_own
// Put the original message into a message struct
status = mime_decode_message(to_reencrypt_from_enigmail_BCC.c_str(), to_reencrypt_from_enigmail_BCC.size(), &enc_msg);
status = mime_decode_message(to_reencrypt_from_enigmail_BCC.c_str(), to_reencrypt_from_enigmail_BCC.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg , nullptr);
@ -1042,7 +1042,7 @@ TEST_F(ReencryptPlusExtraKeysTest, check_efficient_reencrypt_from_pEp_2_0) {
flags = PEP_decrypt_flag_untrusted_server;
// Put the original message into a message struct
status = mime_decode_message(to_reencrypt_from_pEp.c_str(), to_reencrypt_from_pEp.size(), &enc_msg);
status = mime_decode_message(to_reencrypt_from_pEp.c_str(), to_reencrypt_from_pEp.size(), &enc_msg, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(enc_msg , nullptr);

@ -89,7 +89,7 @@ TEST_F(SimpleBodyNotAltTest, check_text_w_html_attach) {
string msg = slurp("test_mails/text message with html attach.eml");
message* parsed = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &parsed);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &parsed, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(parsed, nullptr);
ASSERT_NE(parsed->longmsg, nullptr);
@ -107,7 +107,7 @@ TEST_F(SimpleBodyNotAltTest, check_html_w_text_attach) {
string msg = slurp("test_mails/HTML-only body w text attachment.eml");
message* parsed = NULL;
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &parsed);
PEP_STATUS status = mime_decode_message(msg.c_str(), msg.size(), &parsed, NULL);
ASSERT_EQ(status , PEP_STATUS_OK);
ASSERT_NE(parsed, nullptr);
ASSERT_EQ(parsed->longmsg , nullptr);

@ -193,7 +193,7 @@ TEST_F(UnencryptedPepMailTest, check_unencrypted_pep_message_rcpt) {
PEP_rating rating;
PEP_decrypt_flags_t flags = 0;
mime_decode_message(msgstr.c_str(), msgstr.size(), &enc_msg);
mime_decode_message(msgstr.c_str(), msgstr.size(), &enc_msg, NULL);
ASSERT_TRUE(is_pEpmsg(enc_msg));
status = decrypt_message(session, enc_msg, &dec_msg, &keylist, &rating, &flags);

@ -546,7 +546,7 @@ PEP_STATUS MIME_decrypt_message(
message* dec_msg = NULL;
*mime_plaintext = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;
@ -633,7 +633,7 @@ PEP_STATUS MIME_encrypt_message(
message* enc_msg = NULL;
message* ret_msg = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;
@ -716,7 +716,7 @@ PEP_STATUS MIME_encrypt_message_for_self(
message* tmp_msg = NULL;
message* enc_msg = NULL;
status = mime_decode_message(mimetext, size, &tmp_msg);
status = mime_decode_message(mimetext, size, &tmp_msg, NULL);
if (status != PEP_STATUS_OK)
goto pEp_error;

Loading…
Cancel
Save