[git] GpgOL - branch, master, updated. gpgol-2.3.0-76-g6bdca98
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Oct 8 18:03:23 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via 6bdca98e1f645ca245fbe07254edff3dc6f5d4c5 (commit)
via 385ef5768e47903d5e15a4b711a82b6d2c7ec715 (commit)
via ce85a6ea230d742f6032bf23fab511e89c9b82fb (commit)
from 04b0965b212221c2bcbc6edf00971721caa9df60 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6bdca98e1f645ca245fbe07254edff3dc6f5d4c5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Oct 8 18:02:26 2018 +0200
Trace parsing some more
* src/parsecontroller.cpp (ParseController::parse): Trace
some more.
--
We especially want to know when GpgME calls are finished.
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 84a7592..7dfade8 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -363,6 +363,7 @@ ParseController::parse()
if (decrypt)
{
input.seek (0, SEEK_SET);
+ TRACEPOINT;
auto combined_result = ctx->decryptAndVerify(input, output);
log_debug ("%s:%s:%p decrypt / verify done.",
SRCNAME, __func__, this);
@@ -375,6 +376,7 @@ ParseController::parse()
is_smime (output) ||
output.type() == Data::Type::PGPSigned)
{
+ TRACEPOINT;
/* There is a signature in the output. So we have
to verify it now as an extra step. */
input = Data (m_outputprovider);
@@ -383,11 +385,13 @@ ParseController::parse()
m_outputprovider = new MimeDataProvider();
output = Data(m_outputprovider);
verify = true;
+ TRACEPOINT;
}
else
{
verify = false;
}
+ TRACEPOINT;
if (m_decrypt_result.error () || m_decrypt_result.isNull () ||
m_decrypt_result.error ().isCanceled ())
{
@@ -396,11 +400,13 @@ ParseController::parse()
}
if (verify)
{
- const auto sig = m_inputprovider->signature();
+ TRACEPOINT;
+ GpgME::Data *sig = m_inputprovider->signature();
input.seek (0, SEEK_SET);
if (sig)
{
sig->seek (0, SEEK_SET);
+ TRACEPOINT;
m_verify_result = ctx->verifyDetachedSignature(*sig, input);
log_debug ("%s:%s:%p verify done.",
SRCNAME, __func__, this);
@@ -416,7 +422,9 @@ ParseController::parse()
}
else
{
+ TRACEPOINT;
m_verify_result = ctx->verifyOpaqueSignature(input, output);
+ TRACEPOINT;
const auto sigs = m_verify_result.signatures();
bool allBad = sigs.size();
@@ -488,6 +496,7 @@ ParseController::parse()
bool ultimate_keys_queried = false;
for (const auto sig: m_verify_result.signatures())
{
+ TRACEPOINT;
has_valid_encrypted_checksum = is_valid_chksum (sig);
KeyCache::instance ()->update (sig.fingerprint (), protocol);
@@ -503,6 +512,7 @@ ParseController::parse()
get_ultimate_keys ();
ultimate_keys_queried = true;
}
+ TRACEPOINT;
}
if (protocol == Protocol::CMS && decrypt && !m_decrypt_result.error() &&
@@ -516,6 +526,7 @@ ParseController::parse()
if (opt.enable_debug & DBG_DATA)
{
std::stringstream ss;
+ TRACEPOINT;
ss << m_decrypt_result << '\n' << m_verify_result;
for (const auto sig: m_verify_result.signatures())
{
commit 385ef5768e47903d5e15a4b711a82b6d2c7ec715
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Oct 8 18:01:09 2018 +0200
Tune down an error to an info
* src/keycache.cpp (onUpdateJobDone): Tune down error to
debug.
--
This happens regularly enough if you switch quickly between two mails.
diff --git a/src/keycache.cpp b/src/keycache.cpp
index f0e635b..a414e98 100644
--- a/src/keycache.cpp
+++ b/src/keycache.cpp
@@ -715,7 +715,7 @@ public:
if (it == m_update_jobs.end())
{
- log_error ("%s:%s Update for \"%s\" already finished.",
+ log_debug ("%s:%s Update for \"%s\" already finished.",
SRCNAME, __func__, anonstr (fpr));
gpgol_unlock (&update_lock);
TRETURN;
commit ce85a6ea230d742f6032bf23fab511e89c9b82fb
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Oct 8 18:00:29 2018 +0200
Add new strings for config dialog debug page
* src/addin-options.cpp (i18n_noops): Add new strings.
diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index ac3cdc7..b42bfd8 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -137,7 +137,18 @@ i18n_noops[] = {
warning is shown in line with the combo box to select the
level. */
N_("<b>Warning:</b> Decreased performance. Huge logs!"),
-
+ /* TRANSLATORS: Config dialog category for debug options. */
+ N_("Debug"),
+ /* TRANSLATORS: Config dialog category for debug options. */
+ N_("Configuaration of debug options"),
+ /* TRANSLATORS: Config dialog debug page, can be technical. */
+ N_("Potential workarounds"),
+ /* TRANSLATORS: Config dialog debug page, can be technical. */
+ N_("Block Outlook during encrypt / sign"),
+ /* TRANSLATORS: Config dialog debug page, can be technical. */
+ N_("Block Outlook during decrypt / verify"),
+ /* TRANSLATORS: Config dialog debug page, link to report bug page. */
+ N_("How to report a problem?"),
};
-----------------------------------------------------------------------
Summary of changes:
src/addin-options.cpp | 13 ++++++++++++-
src/keycache.cpp | 2 +-
src/parsecontroller.cpp | 13 ++++++++++++-
3 files changed, 25 insertions(+), 3 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list