Refactored test_utils name.

IPS-2
Krista Bennett 2 years ago
parent 4db5c9dfc7
commit 46c2df4785

@ -14,7 +14,7 @@
#include "keymanagement.h"
#include "message_api.h"
#include "mime.h"
#include "test_util.h" // for slurp()
#include "TestUtilities.h" // for slurp()
#include "TestConstants.h"
#include "Engine.h"

@ -11,7 +11,7 @@
#include "message_api.h"
#include "TestConstants.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "mime.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "mime.h"

@ -5,7 +5,7 @@
#include <string>
#include <cstring> // for strcmp()
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -26,7 +26,7 @@
#include "blacklist.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"

@ -11,7 +11,7 @@
#include "bloblist.h"
#include "TestConstants.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -9,7 +9,7 @@
#include <fstream>
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"

@ -10,7 +10,7 @@
#include "pEp_internal.h"
#include "pEpEngine_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -11,7 +11,7 @@
#include "Engine.h"
#include "test_util.h"
#include "TestUtilities.h"
#include <gtest/gtest.h>

@ -11,7 +11,7 @@
#include <sstream>
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -14,7 +14,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -9,7 +9,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "pEpEngine.h"
#include "pEp_internal.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -8,7 +8,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "internal_format.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -12,7 +12,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -14,7 +14,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -13,7 +13,7 @@
#include "keymanagement.h"
#include "message_api.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "pEpEngine.h"
#include "pEp_internal.h"

@ -16,7 +16,7 @@
#include "platform_unix.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"
#include "pEpTestStatic.h"
#include <algorithm>

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -8,7 +8,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "message.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -6,7 +6,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "mime.h"

@ -6,7 +6,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "keymanagement.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include <iostream>

@ -4,7 +4,7 @@
#include "TestConstants.h"
#include <stdlib.h>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "pEpEngine.h"
#include "pEp_internal.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -11,7 +11,7 @@
#include <fstream>
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "pEpEngine.h"
#include "pEp_internal.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -4,13 +4,13 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "group.h"
#include "group_internal.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "pEp_internal.h"
#include <gtest/gtest.h>

@ -12,7 +12,7 @@
#include "bloblist.h"
#include "base64.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -2,7 +2,7 @@
// see LICENSE.txt
#include "TestConstants.h"
#include "test_util.h"
#include "TestUtilities.h"
#include <stdlib.h>
#include <string>

@ -10,7 +10,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "key_reset.h"

@ -13,7 +13,7 @@
#include "pEp_internal.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -17,7 +17,7 @@
#include "key_reset.h"
#include "key_reset_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"

@ -12,7 +12,7 @@
#include "pEp_internal.h"
#include "platform.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -12,7 +12,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -10,7 +10,7 @@
#include "keymanagement.h"
#include "message_api.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "pEpEngine.h"
#include "pEp_internal.h"

@ -13,7 +13,7 @@
#include "keymanagement.h"
#include "message_api.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -12,7 +12,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -14,7 +14,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -11,7 +11,7 @@
#include "pEp_internal.h"
#include "map_asn1.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -14,7 +14,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -14,7 +14,7 @@
#include "platform.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -7,7 +7,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -13,7 +13,7 @@
#include "platform.h"
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -8,7 +8,7 @@
#include "pEp_internal.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include <fstream>

@ -13,7 +13,7 @@
#include "keymanagement.h"
#include "message_api.h"
#include "mime.h"
#include "test_util.h" // for slurp()
#include "TestUtilities.h" // for slurp()

@ -10,7 +10,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -13,7 +13,7 @@
#include "stringpair.h"
#include "openpgp_compat.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -6,7 +6,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"
#include "mime.h"

@ -4,7 +4,7 @@
#include "internal_format.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -13,7 +13,7 @@
#include "mime.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -3,7 +3,7 @@
#include <cstring>
#include "pEpEngine.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -12,7 +12,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -16,7 +16,7 @@
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -10,7 +10,7 @@
#include "pEp_internal.h"
#include "message.h"
#include "mime.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -10,7 +10,7 @@
#include "stringlist.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -11,7 +11,7 @@
#include "stringpair.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -5,7 +5,7 @@
#include <cstring>
#include <string>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -8,7 +8,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -4,7 +4,7 @@
#include "pEpEngine.h"
#include "pEpEngine_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -3,7 +3,7 @@
#include "pEp_internal.h"
#include "pEp_internal.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "mime.h"
#include "message_api.h"
@ -484,6 +484,51 @@ message* string_to_msg(string infile) {
return out_msg;
}
PEP_STATUS vanilla_encrypt_and_write_to_file(PEP_SESSION session, message* msg, const char* filename) {
if (!session || !msg || !filename)
return PEP_ILLEGAL_VALUE;
message* enc_msg = NULL;
PEP_STATUS status = encrypt_message(session, msg, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
if (status != PEP_STATUS_OK)
return status;
if (!enc_msg)
return PEP_UNKNOWN_ERROR;
char* msg_str = NULL;
msg_str = message_to_str(enc_msg);
if (!msg_str)
return PEP_UNKNOWN_ERROR;
dump_out(filename, msg_str);
free_message(enc_msg);
free(msg_str);
return PEP_STATUS_OK;
}
// For when you ONLY care about the message
PEP_STATUS vanilla_read_file_and_decrypt(PEP_SESSION session, message** msg, const char* filename) {
if (!session || !msg || !filename)
return PEP_ILLEGAL_VALUE;
PEP_STATUS status = PEP_STATUS_OK;
std::string inbox = slurp(filename);
if (inbox.empty())
return PEP_UNKNOWN_ERROR;
message* enc_msg = NULL;
mime_decode_message(inbox.c_str(), inbox.size(), &enc_msg, NULL);
message* dec_msg = NULL;
stringlist_t* keylist = NULL;
PEP_decrypt_flags_t flags = 0;
PEP_rating rating;
status = decrypt_message(session, enc_msg, &dec_msg, &keylist, &rating, &flags);
if (dec_msg)
*msg = dec_msg;
free_stringlist(keylist); // no one cares
free_message(enc_msg);
return status;
}
int util_delete_filepath(const char *filepath,
const struct stat *file_stat,

@ -130,6 +130,10 @@ bool slurp_message_and_import_key(PEP_SESSION session, const char* message_fname
char* message_to_str(message* msg);
message* string_to_msg(std::string infile);
// For when you ONLY care about the message
PEP_STATUS vanilla_encrypt_and_write_to_file(PEP_SESSION session, message* msg, const char* filename);
PEP_STATUS vanilla_read_file_and_decrypt(PEP_SESSION session, message** msg, const char* filename);
int util_delete_filepath(const char *filepath,
const struct stat *file_stat,
int ftw_info,

@ -10,7 +10,7 @@
#include <fstream>
#include "mime.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -8,7 +8,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -7,7 +7,7 @@
#include <iostream>
#include <fstream>
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "pEpEngine.h"

@ -6,7 +6,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

@ -15,7 +15,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -11,7 +11,7 @@
#include "pEp_internal.h"
#include "message_api.h"
#include "keymanagement.h"
#include "test_util.h"
#include "TestUtilities.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "Engine.h"

@ -9,7 +9,7 @@
#include "pEpEngine.h"
#include "pEp_internal.h"
#include "test_util.h"
#include "TestUtilities.h"
#include "TestConstants.h"
#include "Engine.h"

Loading…
Cancel
Save