[git] GpgOL - branch, master, updated. outlook-2007-removal-14-g75e02a5

[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  75e02a5985d3a57668ce7ea8b0057ca919850b1a (commit)
       via  9f7ec6eb29620e9cec66cefe5c10dc15e010b9b2 (commit)
      from  fc05ec08203882176486d7b19ab8504c12910f0c (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 75e02a5985d3a57668ce7ea8b0057ca919850b1a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 1 15:00:14 2018 +0200

    Clarify comment about inline pgp encoding
    
    * src/parsecontroller.cpp (ParseController::parse): Improve
    comment.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index c52bae7..d14af9f 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -393,8 +393,19 @@ ParseController::parse()
               log_debug ("%s:%s:%p inline verify error trying native to utf8.",
                          SRCNAME, __func__, this);
 
-              // Maybe we would need to take the internetcodepage here instead
-              // of native?
+
+              /* The proper solution would be to take the encoding from
+                 the mail / headers. Then convert the wchar body to that
+                 encoding. Verify, and convert it after verifcation to
+                 UTF-8 which the rest of the code expects.
+
+                 Or native_body from native ACP to InternetCodepage, then
+                 verify and convert the output back to utf8 as the rest
+                 expects.
+
+                 But as this is clearsigned and we don't really want that.
+                 Meh.
+                 */
               char *utf8 = native_to_utf8 (input.toString().c_str());
               if (utf8)
                 {

commit 9f7ec6eb29620e9cec66cefe5c10dc15e010b9b2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jun 1 14:59:25 2018 +0200

    Add distinct error for legacy nomdc
    
    * src/parsecontroller.cpp (format_error): Check for
    isLegacyCipherNoMDC.
    
    --
    GnuPG-Bug-Id: T3714

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 88263a6..c52bae7 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -202,6 +202,11 @@ format_error(GpgME::DecryptionResult result, Protocol protocol)
         {
           msg += _("Failed to parse the mail.");
         }
+      else if (result.isLegacyCipherNoMDC())
+        {
+          msg += _("Data is not integrity protected. "
+                   "Decrypting it could be a security problem. (no MDC)");
+        }
       else
         {
           msg += result.error().asString();

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

Summary of changes:
 src/parsecontroller.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)


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