[REFACT] Changed the info strings

Author: hasherezade

pe2shc/main.cpp

@@ -35,7 +35,7 @@ BYTE* shellcodify(BYTE *my_exe, size_t exe_size, size_t &out_size, bool is64b)
 	int res_id = is64b ? STUB64 : STUB32;
 	BYTE *stub = peconv::load_resource_data(stub_size, res_id);
 	if (!stub) {
-		std::cout << "Stub not loaded" << std::endl;
+		std::cout << "[-] Stub not loaded" << std::endl;
 		return nullptr;
 	}
 	size_t ext_size = exe_size + stub_size;
@@ -57,20 +57,20 @@ bool is_supported_pe(BYTE *my_exe, size_t exe_size)
 {
 	if (!my_exe) return false;
 	if (!peconv::has_relocations(my_exe)) {
-		std::cout << "The PE must have relocations!" << std::endl;
+		std::cout << "[-] The PE must have relocations!" << std::endl;
 		return false;
 	}
 	if (peconv::get_subsystem(my_exe) != IMAGE_SUBSYSTEM_WINDOWS_GUI) {
 		std::cout << "[WARNING] This is a console application! The recommended subsystem is GUI." << std::endl;
 	}
 	IMAGE_DATA_DIRECTORY* dotnet_dir = peconv::get_directory_entry(my_exe, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR);
 	if (dotnet_dir) {
-		std::cout << ".NET applications are not supported!" << std::endl;
+		std::cout << "[-] .NET applications are not supported!" << std::endl;
 		return false;
 	}
 	IMAGE_DATA_DIRECTORY* tls_dir = peconv::get_directory_entry(my_exe, IMAGE_DIRECTORY_ENTRY_TLS);
 	if (tls_dir) {
-		std::cout << "Applications with TLS callbacks are not supported!" << std::endl;
+		std::cout << "[-] Applications with TLS callbacks are not supported!" << std::endl;
 		return false;
 	}
 	return true;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
 	std::cout << "Reading module from: " << in_path << std::endl;
 	BYTE *my_exe = peconv::load_file(in_path.c_str(), exe_size);
 	if (!my_exe) {
-		system("pause");
+		std::cout << "[-] Could not read the input file!" << std::endl;
 		return -1;
 	}
 	if (!is_supported_pe(my_exe, exe_size)) {
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 		return -3;
 	}
 	if (peconv::dump_to_file(out_str.c_str(), ext_buf, ext_size)) {
-		std::cout << "[+] Saved to file: " << out_str << std::endl;
+		std::cout << "[+] Saved as: " << out_str << std::endl;
 	}
 	else {
 		std::cout << "[-] Failed to save the output!" << std::endl;

tests/CMakeLists.txt

@@ -22,7 +22,7 @@ set_tests_properties(RunPe2Shc PROPERTIES DEPENDS runshc)
 
 # 2) does conversion of the test application work
 add_test(ConvTestCase1 "${CMAKE_BINARY_DIR}//pe2shc.exe" "${CMAKE_BINARY_DIR}//test_case1.exe" "${CMAKE_BINARY_DIR}//test_case1.shc.exe")
-set_tests_properties(ConvTestCase1 PROPERTIES PASS_REGULAR_EXPRESSION "Saved to file:")
+set_tests_properties(ConvTestCase1 PROPERTIES PASS_REGULAR_EXPRESSION "Saved as:")
 
 # 3) does converted application run properly
 add_test(RunTestCase1 "${CMAKE_BINARY_DIR}//runshc.exe" "${CMAKE_BINARY_DIR}//test_case1.shc.exe")