diff options
| author | Saturn&Eric <[email protected]> | 2024-05-11 17:18:36 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-11 17:18:36 +0000 |
| commit | f909f2c4c35b187eb165ec5545e35d54c6d92bf3 (patch) | |
| tree | 428fe9e63ecae6bb93be6f20cd2b1ee9b29ffd8d /src/core/function/gpg/GpgContext.cpp | |
| parent | Merge pull request #145 from jermanuts/jermanuts-wizard-links-update (diff) | |
| parent | fix: remove qt5compat and redirect dll output path of modules (diff) | |
| download | GpgFrontend-f909f2c4c35b187eb165ec5545e35d54c6d92bf3.tar.gz GpgFrontend-f909f2c4c35b187eb165ec5545e35d54c6d92bf3.zip | |
Merge pull request #148 from saturneric/develop
Develop 2.1.3.1
Diffstat (limited to 'src/core/function/gpg/GpgContext.cpp')
| -rw-r--r-- | src/core/function/gpg/GpgContext.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/core/function/gpg/GpgContext.cpp b/src/core/function/gpg/GpgContext.cpp index 7c84d3c4..7dec318e 100644 --- a/src/core/function/gpg/GpgContext.cpp +++ b/src/core/function/gpg/GpgContext.cpp @@ -94,18 +94,18 @@ class GpgContext::Impl { int fd) -> gpgme_error_t { size_t res; #ifdef QT5_BUILD - QString pass_qstr = "abcdefg\n"; - QByteArray pass = pass_qstr.toUtf8(); + QString pass_qstr = "abcdefg\n"; + QByteArray pass = pass_qstr.toUtf8(); #else - QString pass = "abcdefg\n"; + QString pass = "abcdefg\n"; #endif - + auto passpahrase_size = pass.size(); size_t off = 0; do { #ifdef QT5_BUILD - const char* p_pass = pass.data(); + const char *p_pass = pass.data(); res = gpgme_io_write(fd, &p_pass[off], passpahrase_size - off); #else res = gpgme_io_write(fd, &pass[off], passpahrase_size - off); @@ -246,15 +246,14 @@ class GpgContext::Impl { } // set context offline mode - GF_CORE_LOG_DEBUG("gpg context offline mode: {}", args_.offline_mode); + GF_CORE_LOG_DEBUG("gpg context: offline mode: {}", args_.offline_mode); + GF_CORE_LOG_DEBUG("gpg context: auto import missing key: {}", + args_.auto_import_missing_key); gpgme_set_offline(ctx, args_.offline_mode ? 1 : 0); // set option auto import missing key - // invalid at offline mode - GF_CORE_LOG_DEBUG("gpg context auto import missing key: {}", - args_.offline_mode); - if (!args.offline_mode && args.auto_import_missing_key) { - if (CheckGpgError(gpgme_set_ctx_flag(ctx, "auto-key-import", "1")) != + if (!args_.offline_mode && args.auto_import_missing_key) { + if (CheckGpgError(gpgme_set_ctx_flag(ctx, "auto-key-retrieve", "1")) != GPG_ERR_NO_ERROR) { return false; } |