diff options
Diffstat (limited to 'src/gpg/function/BasicOperator.cpp')
| -rw-r--r-- | src/gpg/function/BasicOperator.cpp | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/gpg/function/BasicOperator.cpp b/src/gpg/function/BasicOperator.cpp index c76f581a..295b6433 100644 --- a/src/gpg/function/BasicOperator.cpp +++ b/src/gpg/function/BasicOperator.cpp @@ -47,9 +47,7 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Encrypt( auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = GpgEncrResult( - gpgme_op_encrypt_result(ctx), - [&](gpgme_encrypt_result_t res) { gpgme_result_unref(res); }); + auto temp_result = GpgEncrResult(gpgme_op_encrypt_result(ctx)); std::swap(result, temp_result); return err; @@ -68,16 +66,14 @@ GpgFrontend::BasicOperator::Decrypt(BypeArrayRef in_buffer, auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = GpgDecrResult( - gpgme_op_decrypt_result(ctx), - [&](gpgme_decrypt_result_t res) { gpgme_result_unref(res); }); + auto temp_result = GpgDecrResult(gpgme_op_decrypt_result(ctx)); std::swap(result, temp_result); return err; } GpgFrontend::GpgError -GpgFrontend::BasicOperator::Verify(QByteArray &in_buffer, +GpgFrontend::BasicOperator::Verify(BypeArrayRef &in_buffer, BypeArrayPtr &sig_buffer, GpgVerifyResult &result) const { gpgme_error_t err; @@ -91,9 +87,7 @@ GpgFrontend::BasicOperator::Verify(QByteArray &in_buffer, } else err = check_gpg_error(gpgme_op_verify(ctx, data_in, nullptr, data_in)); - auto temp_result = GpgVerifyResult( - gpgme_op_verify_result(ctx), - [&](gpgme_verify_result_t res) { gpgme_result_unref(res); }); + auto temp_result = GpgVerifyResult(gpgme_op_verify_result(ctx)); std::swap(result, temp_result); return err; @@ -129,9 +123,7 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Sign(KeyArgsList &keys, auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = - GpgSignResult(gpgme_op_sign_result(ctx), - [&](gpgme_sign_result_t res) { gpgme_result_unref(res); }); + auto temp_result = GpgSignResult(gpgme_op_sign_result(ctx)); std::swap(result, temp_result); @@ -150,14 +142,10 @@ gpgme_error_t GpgFrontend::BasicOperator::DecryptVerify( auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_decr_result = GpgDecrResult( - gpgme_op_decrypt_result(ctx), - [&](gpgme_decrypt_result_t res) { gpgme_result_unref(res); }); + auto temp_decr_result = GpgDecrResult(gpgme_op_decrypt_result(ctx)); std::swap(decrypt_result, temp_decr_result); - auto temp_verify_result = GpgVerifyResult( - gpgme_op_verify_result(ctx), - [&](gpgme_verify_result_t res) { gpgme_result_unref(res); }); + auto temp_verify_result = GpgVerifyResult(gpgme_op_verify_result(ctx)); std::swap(verify_result, temp_verify_result); return err; @@ -190,13 +178,9 @@ gpgme_error_t GpgFrontend::BasicOperator::EncryptSign( auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_encr_result = GpgEncrResult( - gpgme_op_encrypt_result(ctx), - [&](gpgme_encrypt_result_t res) { gpgme_result_unref(res); }); + auto temp_encr_result = GpgEncrResult(gpgme_op_encrypt_result(ctx)); swap(encr_result, temp_encr_result); - auto temp_sign_result = - GpgSignResult(gpgme_op_sign_result(ctx), - [&](gpgme_sign_result_t res) { gpgme_result_unref(res); }); + auto temp_sign_result = GpgSignResult(gpgme_op_sign_result(ctx)); swap(sign_result, temp_sign_result); return err; @@ -211,7 +195,7 @@ void GpgFrontend::BasicOperator::SetSigners(KeyArgsList &keys) { } } if (keys.size() != gpgme_signers_count(ctx)) - qDebug() << "No All Signers Added"; + LOG(INFO) << "No All Signers Added"; } std::unique_ptr<std::vector<GpgFrontend::GpgKey>> |