diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/GpgConstants.cpp (renamed from src/gpg/GpgConstants.cpp) | 107 |
1 files changed, 28 insertions, 79 deletions
diff --git a/src/gpg/GpgConstants.cpp b/src/core/GpgConstants.cpp index 2c9403da..284022a8 100644 --- a/src/gpg/GpgConstants.cpp +++ b/src/core/GpgConstants.cpp @@ -1,4 +1,6 @@ /** + * Copyright (C) 2021 Saturneric + * * This file is part of GpgFrontend. * * GpgFrontend is free software: you can redistribute it and/or modify @@ -6,52 +8,50 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * GpgFrontend is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Foobar. If not, see <https://www.gnu.org/licenses/>. + * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from + * the gpg4usb project, which is under GPL-3.0-or-later. * - * The initial version of the source code is inherited from gpg4usb-team. - * Their source code version also complies with GNU General Public License. + * All the source code of GpgFrontend was modified and released by + * Saturneric<[email protected]> starting on May 12, 2021. * - * The source code version of this software was modified and released - * by Saturneric<[email protected]> starting on May 12, 2021. + * SPDX-License-Identifier: GPL-3.0-or-later * */ -#include "gpg/GpgConstants.h" +#include "core/GpgConstants.h" #include <gpg-error.h> #include <boost/algorithm/string/predicate.hpp> -#include <boost/filesystem.hpp> #include <string> const char* GpgFrontend::GpgConstants::PGP_CRYPT_BEGIN = - "-----BEGIN PGP MESSAGE-----"; + "-----BEGIN PGP MESSAGE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_CRYPT_END = - "-----END PGP MESSAGE-----"; + "-----END PGP MESSAGE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_SIGNED_BEGIN = - "-----BEGIN PGP SIGNED MESSAGE-----"; + "-----BEGIN PGP SIGNED MESSAGE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_SIGNED_END = - "-----END PGP SIGNATURE-----"; + "-----END PGP SIGNATURE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_SIGNATURE_BEGIN = - "-----BEGIN PGP SIGNATURE-----"; + "-----BEGIN PGP SIGNATURE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_SIGNATURE_END = - "-----END PGP SIGNATURE-----"; + "-----END PGP SIGNATURE-----"; ///< const char* GpgFrontend::GpgConstants::PGP_PUBLIC_KEY_BEGIN = - "------BEGIN PGP PUBLIC KEY BLOCK-----"; + "-----BEGIN PGP PUBLIC KEY BLOCK-----"; ///< const char* GpgFrontend::GpgConstants::PGP_PRIVATE_KEY_BEGIN = - "-----BEGIN PGP PRIVATE KEY BLOCK-----"; + "-----BEGIN PGP PRIVATE KEY BLOCK-----"; ///< const char* GpgFrontend::GpgConstants::GPG_FRONTEND_SHORT_CRYPTO_HEAD = - "GpgF_Scpt://"; + "GpgF_Scpt://"; ///< -/// -/// \param err gpg_error_t -/// \return gpgme_error_t GpgFrontend::check_gpg_error(gpgme_error_t err) { if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { LOG(ERROR) << "[" << _("Error") << " " << gpg_err_code(err) << "] " @@ -61,10 +61,6 @@ gpgme_error_t GpgFrontend::check_gpg_error(gpgme_error_t err) { return err; } -/// -/// \param err -/// \param predict -/// \return gpg_err_code_t GpgFrontend::check_gpg_error_2_err_code(gpgme_error_t err, gpgme_error_t predict) { auto err_code = gpg_err_code(err); @@ -76,10 +72,6 @@ gpg_err_code_t GpgFrontend::check_gpg_error_2_err_code(gpgme_error_t err, return err_code; } -/// -/// \param err -/// \param comment -/// \return gpgme_error_t GpgFrontend::check_gpg_error(gpgme_error_t err, const std::string& comment) { if (gpg_err_code(err) != GPG_ERR_NO_ERROR) { @@ -90,9 +82,6 @@ gpgme_error_t GpgFrontend::check_gpg_error(gpgme_error_t err, return err; } -/// -/// \param fingerprint -/// \return std::string GpgFrontend::beautify_fingerprint( GpgFrontend::BypeArrayConstRef fingerprint) { auto len = fingerprint.size(); @@ -106,16 +95,12 @@ std::string GpgFrontend::beautify_fingerprint( return out.str(); } -/// -/// \param s static inline void ltrim(std::string& s) { s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { return !std::isspace(ch); })); } -/// -/// \param s static inline void rtrim(std::string& s) { s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) { return !std::isspace(ch); }) @@ -123,25 +108,19 @@ static inline void rtrim(std::string& s) { s.end()); } -/// -/// \param s -/// \return static inline std::string trim(std::string& s) { ltrim(s); rtrim(s); return s; } -/// -/// \param utf8_path -/// \return std::string GpgFrontend::read_all_data_in_file(const std::string& utf8_path) { - using namespace boost::filesystem; + using namespace std::filesystem; class path file_info(utf8_path.c_str()); if (!exists(file_info) || !is_regular_file(file_info)) return {}; std::ifstream in_file; #ifndef WINDOWS - in_file.open(file_info.string(), std::ios::in); + in_file.open(file_info.u8string(), std::ios::in); #else in_file.open(file_info.wstring().c_str(), std::ios::in); #endif @@ -153,16 +132,12 @@ std::string GpgFrontend::read_all_data_in_file(const std::string& utf8_path) { return in_buffer; } -/// -/// \param utf8_path -/// \param out_buffer -/// \return bool GpgFrontend::write_buffer_to_file(const std::string& utf8_path, const std::string& out_buffer) { - using namespace boost::filesystem; + using namespace std::filesystem; class path file_info(utf8_path.c_str()); #ifndef WINDOWS - std::ofstream out_file(file_info.string(), std::ios::out | std::ios::trunc); + std::ofstream out_file(file_info.u8string(), std::ios::out | std::ios::trunc); #else std::ofstream out_file(file_info.wstring().c_str(), std::ios::out | std::ios::trunc); @@ -173,40 +148,31 @@ bool GpgFrontend::write_buffer_to_file(const std::string& utf8_path, return true; } -/// -/// \param path -/// \return std::string GpgFrontend::get_file_extension(const std::string& path) { // Create a path object from given string - boost::filesystem::path path_obj(path); + std::filesystem::path path_obj(path); // Check if file name in the path object has extension if (path_obj.has_extension()) { // Fetch the extension from path object and return - return path_obj.extension().string(); + return path_obj.extension().u8string(); } // In case of no extension return empty string return {}; } -/// -/// \param path -/// \return std::string GpgFrontend::get_only_file_name_with_path(const std::string& path) { // Create a path object from given string - boost::filesystem::path path_obj(path); + std::filesystem::path path_obj(path); // Check if file name in the path object has extension if (path_obj.has_filename()) { // Fetch the extension from path object and return - return (path_obj.parent_path() / path_obj.stem()).string(); + return (path_obj.parent_path() / path_obj.stem()).u8string(); } // In case of no extension return empty string return {}; } -/// -/// \param text -/// \return int GpgFrontend::text_is_signed(GpgFrontend::BypeArrayRef text) { using boost::algorithm::ends_with; using boost::algorithm::starts_with; @@ -222,53 +188,36 @@ int GpgFrontend::text_is_signed(GpgFrontend::BypeArrayRef text) { return 0; } -/// -/// \param result -/// \return GpgFrontend::GpgEncrResult GpgFrontend::_new_result( gpgme_encrypt_result_t&& result) { gpgme_result_ref(result); return {result, _result_ref_deletor()}; } -/// -/// \param result -/// \return GpgFrontend::GpgDecrResult GpgFrontend::_new_result( gpgme_decrypt_result_t&& result) { gpgme_result_ref(result); return {result, _result_ref_deletor()}; } -/// -/// \param result -/// \return GpgFrontend::GpgSignResult GpgFrontend::_new_result( gpgme_sign_result_t&& result) { gpgme_result_ref(result); return {result, _result_ref_deletor()}; } -/// -/// \param result -/// \return GpgFrontend::GpgVerifyResult GpgFrontend::_new_result( gpgme_verify_result_t&& result) { gpgme_result_ref(result); return {result, _result_ref_deletor()}; } -/// -/// \param result -/// \return GpgFrontend::GpgGenKeyResult GpgFrontend::_new_result( gpgme_genkey_result_t&& result) { gpgme_result_ref(result); return {result, _result_ref_deletor()}; } -/// -/// \param _result void GpgFrontend::_result_ref_deletor::operator()(void* _result) { DLOG(INFO) << _("Called") << _result; if (_result != nullptr) gpgme_result_unref(_result); |