diff options
Diffstat (limited to '')
| -rw-r--r-- | src/gpg/function/BasicOperator.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/gpg/function/BasicOperator.cpp b/src/gpg/function/BasicOperator.cpp index 4f88b34f..6c699df1 100644 --- a/src/gpg/function/BasicOperator.cpp +++ b/src/gpg/function/BasicOperator.cpp @@ -43,12 +43,12 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Encrypt( GpgData data_in(in_buffer.data(), in_buffer.size()), data_out; gpgme_error_t err = check_gpg_error(gpgme_op_encrypt( - ctx, recipients, GPGME_ENCRYPT_ALWAYS_TRUST, data_in, data_out)); + ctx_, recipients, GPGME_ENCRYPT_ALWAYS_TRUST, data_in, data_out)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = _new_result(gpgme_op_encrypt_result(ctx)); + auto temp_result = _new_result(gpgme_op_encrypt_result(ctx_)); std::swap(result, temp_result); return err; @@ -60,12 +60,12 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Decrypt( gpgme_error_t err; GpgData data_in(in_buffer.data(), in_buffer.size()), data_out; - err = check_gpg_error(gpgme_op_decrypt(ctx, data_in, data_out)); + err = check_gpg_error(gpgme_op_decrypt(ctx_, data_in, data_out)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = _new_result(gpgme_op_decrypt_result(ctx)); + auto temp_result = _new_result(gpgme_op_decrypt_result(ctx_)); std::swap(result, temp_result); return err; @@ -81,11 +81,11 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Verify( if (sig_buffer != nullptr) { GpgData sig_data(sig_buffer->data(), sig_buffer->size()); - err = check_gpg_error(gpgme_op_verify(ctx, sig_data, data_in, nullptr)); + err = check_gpg_error(gpgme_op_verify(ctx_, sig_data, data_in, nullptr)); } else - err = check_gpg_error(gpgme_op_verify(ctx, data_in, nullptr, data_out)); + err = check_gpg_error(gpgme_op_verify(ctx_, data_in, nullptr, data_out)); - auto temp_result = _new_result(gpgme_op_verify_result(ctx)); + auto temp_result = _new_result(gpgme_op_verify_result(ctx_)); std::swap(result, temp_result); return err; @@ -103,12 +103,12 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Sign(KeyListPtr signers, GpgData data_in(in_buffer.data(), in_buffer.size()), data_out; - err = check_gpg_error(gpgme_op_sign(ctx, data_in, data_out, mode)); + err = check_gpg_error(gpgme_op_sign(ctx_, data_in, data_out, mode)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_result = _new_result(gpgme_op_sign_result(ctx)); + auto temp_result = _new_result(gpgme_op_sign_result(ctx_)); std::swap(result, temp_result); @@ -122,15 +122,15 @@ gpgme_error_t GpgFrontend::BasicOperator::DecryptVerify( GpgData data_in(in_buffer.data(), in_buffer.size()), data_out; - err = check_gpg_error(gpgme_op_decrypt_verify(ctx, data_in, data_out)); + err = check_gpg_error(gpgme_op_decrypt_verify(ctx_, data_in, data_out)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_decr_result = _new_result(gpgme_op_decrypt_result(ctx)); + auto temp_decr_result = _new_result(gpgme_op_decrypt_result(ctx_)); std::swap(decrypt_result, temp_decr_result); - auto temp_verify_result = _new_result(gpgme_op_verify_result(ctx)); + auto temp_verify_result = _new_result(gpgme_op_verify_result(ctx_)); std::swap(verify_result, temp_verify_result); return err; @@ -157,39 +157,39 @@ gpgme_error_t GpgFrontend::BasicOperator::EncryptSign( // If the last parameter isnt 0, a private copy of data is made err = check_gpg_error(gpgme_op_encrypt_sign( - ctx, recipients, GPGME_ENCRYPT_ALWAYS_TRUST, data_in, data_out)); + ctx_, recipients, GPGME_ENCRYPT_ALWAYS_TRUST, data_in, data_out)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); - auto temp_encr_result = _new_result(gpgme_op_encrypt_result(ctx)); + auto temp_encr_result = _new_result(gpgme_op_encrypt_result(ctx_)); swap(encr_result, temp_encr_result); - auto temp_sign_result = _new_result(gpgme_op_sign_result(ctx)); + auto temp_sign_result = _new_result(gpgme_op_sign_result(ctx_)); swap(sign_result, temp_sign_result); return err; } void GpgFrontend::BasicOperator::SetSigners(KeyArgsList& signers) { - gpgme_signers_clear(ctx); + gpgme_signers_clear(ctx_); for (const GpgKey& key : signers) { DLOG(INFO) << "key" << key.fpr(); if (key.CanSignActual()) { DLOG(INFO) << "signer"; - auto error = gpgme_signers_add(ctx, gpgme_key_t(key)); + auto error = gpgme_signers_add(ctx_, gpgme_key_t(key)); check_gpg_error(error); } } - if (signers.size() != gpgme_signers_count(ctx)) + if (signers.size() != gpgme_signers_count(ctx_)) DLOG(INFO) << "No All Signers Added"; } std::unique_ptr<GpgFrontend::KeyArgsList> GpgFrontend::BasicOperator::GetSigners() { - auto count = gpgme_signers_count(ctx); + auto count = gpgme_signers_count(ctx_); auto signers = std::make_unique<std::vector<GpgKey>>(); for (auto i = 0u; i < count; i++) { - auto key = GpgKey(gpgme_signers_enum(ctx, i)); + auto key = GpgKey(gpgme_signers_enum(ctx_, i)); signers->push_back(GpgKey(std::move(key))); } return signers; @@ -201,14 +201,14 @@ gpg_error_t GpgFrontend::BasicOperator::EncryptSymmetric( GpgData data_in(in_buffer.data(), in_buffer.size()), data_out; gpgme_error_t err = check_gpg_error(gpgme_op_encrypt( - ctx, nullptr, GPGME_ENCRYPT_SYMMETRIC, data_in, data_out)); + ctx_, nullptr, GPGME_ENCRYPT_SYMMETRIC, data_in, data_out)); auto temp_data_out = data_out.Read2Buffer(); std::swap(temp_data_out, out_buffer); // TODO(Saturneric): maybe a bug of gpgme if (gpgme_err_code(err) == GPG_ERR_NO_ERROR) { - auto temp_result = _new_result(gpgme_op_encrypt_result(ctx)); + auto temp_result = _new_result(gpgme_op_encrypt_result(ctx_)); std::swap(result, temp_result); } |