1 files changed, 5 insertions, 41 deletions

diff --git a/utils/decrypt_bmp.cpp b/utils/decrypt_bmp.cpp
index 9032dc2..4842fbd 100644
--- a/utils/decrypt_bmp.cpp
+++ b/utils/decrypt_bmp.cpp
@@ -4,65 +4,29 @@
 // Distributed under the MIT License.
 
 #include "file_cmd_parser.hpp"
+#include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
 
+#include <Windows.h>
+
 #include <boost/program_options.hpp>
 
-#include <cstdlib>
 #include <cstring>
 
 #include <exception>
-#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <vector>
 
-#include <Windows.h>
-
 namespace
 {
-    std::ifstream::pos_type get_file_size(const std::string& path)
-    {
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
-        return ifs.tellg();
-    }
-
-    std::vector<char> read_file(const std::string& path)
-    {
-        const auto size = static_cast<std::size_t>(get_file_size(path));
-
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary);
-
-        std::vector<char> ciphertext_buf;
-        ciphertext_buf.reserve(size);
-        ciphertext_buf.assign(
-            std::istreambuf_iterator<char>(ifs),
-            std::istreambuf_iterator<char>());
-        return ciphertext_buf;
-    }
-
-    void write_file(
-        const std::string& path,
-        const std::vector<unsigned char>& src)
-    {
-        std::ofstream ofs;
-        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
-        ofs.open(path, std::ofstream::binary);
-        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
-    }
-
     void decrypt_bmp(
         aes::Box& box,
         const std::string& ciphertext_path,
         const std::string& plaintext_path)
     {
-        const auto ciphertext_buf = read_file(ciphertext_path);
+        const auto ciphertext_buf = file::read_file(ciphertext_path);
 
         const auto bmp_header = reinterpret_cast<const BITMAPFILEHEADER*>(ciphertext_buf.data());
 
@@ -77,7 +41,7 @@ namespace
         std::memcpy(plaintext_buf.data(), bmp_header, header_size);
         std::memcpy(plaintext_buf.data() + header_size, pixels.data(), pixels.size());
 
-        write_file(plaintext_path, plaintext_buf);
+        file::write_file(plaintext_path, plaintext_buf);
     }
 
     void decrypt_bmp(const Settings& settings)