[git] GpgOL - branch, master, updated. gpgol-1.4.0-285-g030907d

[by Andre Heinecke]

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  030907daeb75774b67ffe9d8a36a481c8fed4673 (commit)
       via  62e48a46f8573361ac51fa0ca69c1b9fdec12a20 (commit)
      from  ef038f2d1db15ef14c238137c1c42a99bbe25f42 (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 030907daeb75774b67ffe9d8a36a481c8fed4673
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 25 11:10:02 2017 +0200

    Add more debug output during parsing
    
    * src/mail.cpp (Mail::decrypt_verify): Put out parser + subject.
    * src/parsecontroller.cpp (ParseController::parse): Add more debug.
    
    --
    This should show it better where we hand of control to gpgme / gnupg.

diff --git a/src/mail.cpp b/src/mail.cpp
index 8881223..e7a2a51 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -745,6 +745,8 @@ Mail::decrypt_verify()
 
   m_parser = std::shared_ptr <ParseController> (new ParseController (cipherstream, m_type));
   m_parser->setSender(GpgME::UserID::addrSpecFromString(get_sender().c_str()));
+  log_mime_parser ("%s:%s: Parser for \"%s\" is %p",
+                   SRCNAME, __func__, get_subject ().c_str(), m_parser.get());
   gpgol_release (cipherstream);
 
   HANDLE parser_thread = CreateThread (NULL, 0, do_parsing, (LPVOID) this, 0,
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 4fcedb7..25cdc5e 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -276,8 +276,8 @@ ParseController::parse()
     }
 
   Data output (m_outputprovider);
-  log_debug ("%s:%s: decrypt: %i verify: %i with protocol: %s sender: %s",
-             SRCNAME, __func__,
+  log_debug ("%s:%s:%p decrypt: %i verify: %i with protocol: %s sender: %s",
+             SRCNAME, __func__, this,
              decrypt, verify,
              protocol == OpenPGP ? "OpenPGP" :
              protocol == CMS ? "CMS" : "Unknown",
@@ -286,6 +286,8 @@ ParseController::parse()
     {
       input.seek (0, SEEK_SET);
       auto combined_result = ctx->decryptAndVerify(input, output);
+      log_debug ("%s:%s:%p decrypt / verify done.",
+                 SRCNAME, __func__, this);
       m_decrypt_result = combined_result.first;
       m_verify_result = combined_result.second;
 
@@ -321,6 +323,8 @@ ParseController::parse()
         {
           sig->seek (0, SEEK_SET);
           m_verify_result = ctx->verifyDetachedSignature(*sig, input);
+          log_debug ("%s:%s:%p verify done.",
+                     SRCNAME, __func__, this);
           /* Copy the input to output to do a mime parsing. */
           char buf[4096];
           input.seek (0, SEEK_SET);
@@ -337,8 +341,8 @@ ParseController::parse()
         }
     }
   delete ctx;
-  log_debug ("%s:%s: decrypt err: %i verify err: %i",
-             SRCNAME, __func__, m_decrypt_result.error().code(),
+  log_debug ("%s:%s:%p: decrypt err: %i verify err: %i",
+             SRCNAME, __func__, this, m_decrypt_result.error().code(),
              m_verify_result.error().code());
 
   TRACEPOINT;

commit 62e48a46f8573361ac51fa0ca69c1b9fdec12a20
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 25 10:53:59 2017 +0200

    Fix compliance mode check
    
    * src/mail.cpp (in_de_vs_mode): Fix logic.
    
    --
    Yeah it shows that I coded too little C in the last year...

diff --git a/src/mail.cpp b/src/mail.cpp
index 1f65f44..8881223 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -91,9 +91,9 @@ in_de_vs_mode()
         {
           for (const auto &option: component.options ())
             {
-              if (option.name () && strcmp (option.name (), "compliance") &&
+              if (option.name () && !strcmp (option.name (), "compliance") &&
                   option.currentValue ().stringValue () &&
-                  stricmp (option.currentValue ().stringValue (), "de-vs"))
+                  !stricmp (option.currentValue ().stringValue (), "de-vs"))
                 {
                   log_debug ("%s:%s: Detected de-vs mode",
                              SRCNAME, __func__);

-----------------------------------------------------------------------

Summary of changes:
 src/mail.cpp            |  6 ++++--
 src/parsecontroller.cpp | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org