aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/function/gpg/GpgBasicOperator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/function/gpg/GpgBasicOperator.cpp')
-rw-r--r--src/core/function/gpg/GpgBasicOperator.cpp74
1 files changed, 42 insertions, 32 deletions
diff --git a/src/core/function/gpg/GpgBasicOperator.cpp b/src/core/function/gpg/GpgBasicOperator.cpp
index d770e2f2..c74eeea9 100644
--- a/src/core/function/gpg/GpgBasicOperator.cpp
+++ b/src/core/function/gpg/GpgBasicOperator.cpp
@@ -28,26 +28,26 @@
#include "GpgBasicOperator.h"
-#include <vector>
-
-#include "GpgKeyGetter.h"
-
GpgFrontend::GpgBasicOperator::GpgBasicOperator(int channel)
: SingletonFunctionObject<GpgBasicOperator>(channel) {}
-GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Encrypt(
+auto GpgFrontend::GpgBasicOperator::Encrypt(
KeyListPtr keys, GpgFrontend::BypeArrayRef in_buffer,
- GpgFrontend::ByteArrayPtr& out_buffer, GpgFrontend::GpgEncrResult& result) {
+ GpgFrontend::ByteArrayPtr& out_buffer, GpgFrontend::GpgEncrResult& result)
+ -> GpgFrontend::GpgError {
// gpgme_encrypt_result_t e_result;
gpgme_key_t recipients[keys->size() + 1];
int index = 0;
- for (const auto& key : *keys) recipients[index++] = gpgme_key_t(key);
+ for (const auto& key : *keys) {
+ recipients[index++] = static_cast<gpgme_key_t>(key);
+ }
// Last entry data_in array has to be nullptr
recipients[keys->size()] = nullptr;
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
gpgme_error_t err = check_gpg_error(gpgme_op_encrypt(
ctx_, recipients, GPGME_ENCRYPT_ALWAYS_TRUST, data_in, data_out));
@@ -61,12 +61,13 @@ GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Encrypt(
return err;
}
-GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Decrypt(
+auto GpgFrontend::GpgBasicOperator::Decrypt(
BypeArrayRef in_buffer, GpgFrontend::ByteArrayPtr& out_buffer,
- GpgFrontend::GpgDecrResult& result) {
+ GpgFrontend::GpgDecrResult& result) -> GpgFrontend::GpgError {
gpgme_error_t err;
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
err = check_gpg_error(gpgme_op_decrypt(ctx_, data_in, data_out));
auto temp_data_out = data_out.Read2Buffer();
@@ -78,19 +79,21 @@ GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Decrypt(
return err;
}
-GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Verify(
- BypeArrayRef& in_buffer, ByteArrayPtr& sig_buffer,
- GpgVerifyResult& result) const {
+auto GpgFrontend::GpgBasicOperator::Verify(BypeArrayRef& in_buffer,
+ ByteArrayPtr& sig_buffer,
+ GpgVerifyResult& result) const
+ -> GpgFrontend::GpgError {
gpgme_error_t err;
GpgData data_in(in_buffer.data(), in_buffer.size());
GpgData data_out;
- if (sig_buffer != nullptr && sig_buffer->size() > 0) {
+ if (sig_buffer != nullptr && !sig_buffer->empty()) {
GpgData sig_data(sig_buffer->data(), sig_buffer->size());
err = check_gpg_error(gpgme_op_verify(ctx_, sig_data, data_in, nullptr));
- } else
+ } else {
err = check_gpg_error(gpgme_op_verify(ctx_, data_in, nullptr, data_out));
+ }
auto temp_result = _new_result(gpgme_op_verify_result(ctx_));
std::swap(result, temp_result);
@@ -98,15 +101,16 @@ GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Verify(
return err;
}
-GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Sign(
+auto GpgFrontend::GpgBasicOperator::Sign(
KeyListPtr signers, BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
- gpgme_sig_mode_t mode, GpgSignResult& result) {
+ gpgme_sig_mode_t mode, GpgSignResult& result) -> GpgFrontend::GpgError {
gpgme_error_t err;
// Set Singers of this opera
SetSigners(*signers);
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
err = check_gpg_error(gpgme_op_sign(ctx_, data_in, data_out, mode));
@@ -120,12 +124,14 @@ GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Sign(
return err;
}
-gpgme_error_t GpgFrontend::GpgBasicOperator::DecryptVerify(
+auto GpgFrontend::GpgBasicOperator::DecryptVerify(
BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
- GpgDecrResult& decrypt_result, GpgVerifyResult& verify_result) {
+ GpgDecrResult& decrypt_result, GpgVerifyResult& verify_result)
+ -> gpgme_error_t {
gpgme_error_t err;
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
err = check_gpg_error(gpgme_op_decrypt_verify(ctx_, data_in, data_out));
@@ -141,10 +147,10 @@ gpgme_error_t GpgFrontend::GpgBasicOperator::DecryptVerify(
return err;
}
-gpgme_error_t GpgFrontend::GpgBasicOperator::EncryptSign(
+auto GpgFrontend::GpgBasicOperator::EncryptSign(
KeyListPtr keys, KeyListPtr signers, BypeArrayRef in_buffer,
ByteArrayPtr& out_buffer, GpgEncrResult& encr_result,
- GpgSignResult& sign_result) {
+ GpgSignResult& sign_result) -> gpgme_error_t {
gpgme_error_t err;
SetSigners(*signers);
@@ -153,12 +159,15 @@ gpgme_error_t GpgFrontend::GpgBasicOperator::EncryptSign(
// set key for user
int index = 0;
- for (const auto& key : *keys) recipients[index++] = gpgme_key_t(key);
+ for (const auto& key : *keys) {
+ recipients[index++] = static_cast<gpgme_key_t>(key);
+ }
// Last entry dataIn array has to be nullptr
recipients[keys->size()] = nullptr;
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
// If the last parameter isnt 0, a private copy of data is made
err = check_gpg_error(gpgme_op_encrypt_sign(
@@ -189,22 +198,23 @@ void GpgFrontend::GpgBasicOperator::SetSigners(KeyArgsList& signers) {
SPDLOG_DEBUG("not all signers added");
}
-std::unique_ptr<GpgFrontend::KeyArgsList>
-GpgFrontend::GpgBasicOperator::GetSigners() {
+auto GpgFrontend::GpgBasicOperator::GetSigners()
+ -> std::unique_ptr<GpgFrontend::KeyArgsList> {
auto count = gpgme_signers_count(ctx_);
auto signers = std::make_unique<std::vector<GpgKey>>();
- for (auto i = 0u; i < count; i++) {
+ for (auto i = 0U; i < count; i++) {
auto key = GpgKey(gpgme_signers_enum(ctx_, i));
signers->push_back(GpgKey(std::move(key)));
}
return signers;
}
-gpg_error_t GpgFrontend::GpgBasicOperator::EncryptSymmetric(
+auto GpgFrontend::GpgBasicOperator::EncryptSymmetric(
GpgFrontend::ByteArray& in_buffer, GpgFrontend::ByteArrayPtr& out_buffer,
- GpgFrontend::GpgEncrResult& result) {
+ GpgFrontend::GpgEncrResult& result) -> gpg_error_t {
// deepcopy from ByteArray to GpgData
- GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
+ GpgData data_in(in_buffer.data(), in_buffer.size());
+ GpgData data_out;
gpgme_error_t err = check_gpg_error(gpgme_op_encrypt(
ctx_, nullptr, GPGME_ENCRYPT_SYMMETRIC, data_in, data_out));
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 23:25:22 +0000