diff options
Diffstat (limited to 'src/core/function/gpg/GpgKeyOpera.cpp')
-rw-r--r-- | src/core/function/gpg/GpgKeyOpera.cpp | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp index aa9bafaf..54c90182 100644 --- a/src/core/function/gpg/GpgKeyOpera.cpp +++ b/src/core/function/gpg/GpgKeyOpera.cpp @@ -61,7 +61,7 @@ void GpgKeyOpera::DeleteKeys(KeyIdArgsListPtr key_ids) { GPGME_DELETE_ALLOW_SECRET | GPGME_DELETE_FORCE)); assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); } else { - qCWarning(core) << "GpgKeyOpera DeleteKeys get key failed: " << tmp; + LOG_W() << "GpgKeyOpera DeleteKeys get key failed: " << tmp; } } } @@ -113,8 +113,8 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key, output_path, "--gen-revoke", key.GetFingerprint()}, [=](int exit_code, const QString& p_out, const QString& p_err) { if (exit_code != 0) { - qCWarning(core) << "gnupg gen revoke execute error, process stderr: " - << p_err << ", process stdout: " << p_out; + LOG_W() << "gnupg gen revoke execute error, process stderr: " + << p_err << ", process stdout: " << p_out; } else { qCDebug(core, "gnupg gen revoke exit_code: %d, process stdout size: %lld", @@ -159,8 +159,7 @@ void GpgKeyOpera::GenerateKey(const std::shared_ptr<GenKeyInfo>& params, auto userid = params->GetUserid(); auto algo = params->GetAlgo() + params->GetKeySizeStr(); - qCDebug(core) << "params: " << params->GetAlgo() - << params->GetKeySizeStr(); + LOG_D() << "params: " << params->GetAlgo() << params->GetKeySizeStr(); unsigned long expires = QDateTime::currentDateTime().secsTo(params->GetExpireTime()); @@ -175,8 +174,8 @@ void GpgKeyOpera::GenerateKey(const std::shared_ptr<GenKeyInfo>& params, if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "key generation args: " << userid << algo << expires - << flags; + LOG_D() << "key generation args: " << userid << algo << expires + << flags; err = gpgme_op_createkey(ctx.DefaultContext(), userid.toUtf8(), algo.toUtf8(), 0, expires, nullptr, flags); @@ -200,8 +199,7 @@ auto GpgKeyOpera::GenerateKeySync(const std::shared_ptr<GenKeyInfo>& params) auto userid = params->GetUserid(); auto algo = params->GetAlgo() + params->GetKeySizeStr(); - qCDebug(core) << "params: " << params->GetAlgo() - << params->GetKeySizeStr(); + LOG_D() << "params: " << params->GetAlgo() << params->GetKeySizeStr(); unsigned long expires = QDateTime::currentDateTime().secsTo(params->GetExpireTime()); @@ -216,8 +214,8 @@ auto GpgKeyOpera::GenerateKeySync(const std::shared_ptr<GenKeyInfo>& params) if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "key generation args: " << userid << algo << expires - << flags; + LOG_D() << "key generation args: " << userid << algo << expires + << flags; err = gpgme_op_createkey(ctx.DefaultContext(), userid.toUtf8(), algo.toUtf8(), 0, expires, nullptr, flags); @@ -241,8 +239,8 @@ void GpgKeyOpera::GenerateSubkey(const GpgKey& key, [key, &ctx = ctx_, params](const DataObjectPtr& data_object) -> GpgError { if (!params->IsSubKey()) return GPG_ERR_CANCELED; - qCDebug(core) << "generate subkey algo: " << params->GetAlgo() - << "key size: " << params->GetKeySizeStr(); + LOG_D() << "generate subkey algo: " << params->GetAlgo() + << "key size: " << params->GetKeySizeStr(); auto algo = params->GetAlgo() + params->GetKeySizeStr(); unsigned long expires = @@ -256,8 +254,8 @@ void GpgKeyOpera::GenerateSubkey(const GpgKey& key, if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "subkey generation args: " << key.GetId() << algo - << expires << flags; + LOG_D() << "subkey generation args: " << key.GetId() << algo << expires + << flags; auto err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), @@ -281,8 +279,8 @@ auto GpgKeyOpera::GenerateSubkeySync(const GpgKey& key, [key, &ctx = ctx_, params](const DataObjectPtr& data_object) -> GpgError { if (!params->IsSubKey()) return GPG_ERR_CANCELED; - qCDebug(core) << "generate subkey algo: " << params->GetAlgo() - << " key size: " << params->GetKeySizeStr(); + LOG_D() << "generate subkey algo: " << params->GetAlgo() + << " key size: " << params->GetKeySizeStr(); auto algo = params->GetAlgo() + params->GetKeySizeStr(); unsigned long expires = @@ -296,7 +294,7 @@ auto GpgKeyOpera::GenerateSubkeySync(const GpgKey& key, if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << " args: " << key.GetId() << algo << expires << flags; + LOG_D() << " args: " << key.GetId() << algo << expires << flags; auto err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), @@ -336,8 +334,8 @@ void GpgKeyOpera::GenerateKeyWithSubkey( if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "key generation args: " << userid << algo << expires - << flags; + LOG_D() << "key generation args: " << userid << algo << expires + << flags; err = gpgme_op_createkey(ctx.DefaultContext(), userid, algo, 0, expires, nullptr, flags); @@ -358,8 +356,8 @@ void GpgKeyOpera::GenerateKeyWithSubkey( auto key = GpgKeyGetter::GetInstance().GetKey(genkey_result.GetFingerprint()); if (!key.IsGood()) { - qCWarning(core) << "cannot get key which has been generate, fpr: " - << genkey_result.GetFingerprint(); + LOG_W() << "cannot get key which has been generate, fpr: " + << genkey_result.GetFingerprint(); return err; } @@ -375,8 +373,8 @@ void GpgKeyOpera::GenerateKeyWithSubkey( if (subkey_params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (subkey_params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "subkey generation args: " << key.GetId() << algo - << expires << flags; + LOG_D() << "subkey generation args: " << key.GetId() << algo << expires + << flags; err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), algo, 0, @@ -417,8 +415,8 @@ auto GpgKeyOpera::GenerateKeyWithSubkeySync( if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "key generation args: " << userid << algo << expires - << flags; + LOG_D() << "key generation args: " << userid << algo << expires + << flags; err = gpgme_op_createkey(ctx.DefaultContext(), userid, algo, 0, expires, nullptr, flags); @@ -439,14 +437,14 @@ auto GpgKeyOpera::GenerateKeyWithSubkeySync( auto key = GpgKeyGetter::GetInstance().GetKey(genkey_result.GetFingerprint()); if (!key.IsGood()) { - qCWarning(core) << "cannot get key which has been generate, fpr: " - << genkey_result.GetFingerprint(); + LOG_W() << "cannot get key which has been generate, fpr: " + << genkey_result.GetFingerprint(); return err; } - qCDebug(core) << "try to generate subkey of key: " << key.GetId() - << ", algo :" << subkey_params->GetAlgo() - << ", key size: " << subkey_params->GetKeySizeStr(); + LOG_D() << "try to generate subkey of key: " << key.GetId() + << ", algo :" << subkey_params->GetAlgo() + << ", key size: " << subkey_params->GetKeySizeStr(); algo = (subkey_params->GetAlgo() + subkey_params->GetKeySizeStr()) .toUtf8(); @@ -460,8 +458,8 @@ auto GpgKeyOpera::GenerateKeyWithSubkeySync( if (subkey_params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (subkey_params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - qCDebug(core) << "subkey generation args: " << key.GetId() << algo - << expires << flags; + LOG_D() << "subkey generation args: " << key.GetId() << algo << expires + << flags; err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), algo, 0, @@ -494,10 +492,10 @@ auto GpgKeyOpera::ModifyTOFUPolicy( const GpgKey& key, gpgme_tofu_policy_t tofu_policy) -> GpgError { const auto gnupg_version = Module::RetrieveRTValueTypedOrDefault<>( "core", "gpgme.ctx.gnupg_version", QString{"2.0.0"}); - qCDebug(core) << "got gnupg version from rt: " << gnupg_version; + LOG_D() << "got gnupg version from rt: " << gnupg_version; if (GFCompareSoftwareVersion(gnupg_version, "2.1.10") < 0) { - qCWarning(core, "operator not support"); + FLOG_W("operator not support"); return GPG_ERR_NOT_SUPPORTED; } |