[git] GpgOL - branch, master, updated. gpgol-2.2.0-164-g0e05606

[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  0e05606f693114b491a74030e7ae54c75738eeae (commit)
       via  1656e01d2eb19c8349dcab9d9b7e25fb85b9c854 (commit)
       via  1b4138508044d7f794b23994bec6fb46c0238142 (commit)
      from  4c573f3c898429628c3344c88379319f271b900a (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 0e05606f693114b491a74030e7ae54c75738eeae
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 30 09:44:43 2018 +0200

    Also check for pgp/inline in IPM.Note.SMIME
    
    * src/mapihelp.cpp (mapi_change_message_class): Also check
    for inline in IPM.Note.SMIME
    
    GnuPG-Bug-Id: T4115

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index b01711a..f99a729 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1506,6 +1506,29 @@ mapi_change_message_class (LPMESSAGE message, int sync_override,
           newvalue = change_message_class_ipm_note_smime_multipartsigned
             (message);
         }
+      else if (!opt.enable_smime && !strcmp (s, "IPM.Note.SMIME"))
+        {
+          /* This is enterprise level gateway encryption stuff.
+
+             E.g. we can have awesome other tools that send pgp
+             inline and a gateway that signs everything with S/MIME.
+
+             So let's look at the body to figure out if we are
+             PGP.
+
+             This won't work usually as the body is not yet accessible.
+             Still it does not hurt to try as the experience is that
+             the message class in outlook is not used consistently.
+             */
+          newvalue = get_msgcls_from_pgp_lines (message);
+
+          if (newvalue)
+            {
+              log_debug ("%s:%s: PGP Inline detected in S/MIME message. "
+                         "Type is now '%s'",
+                         SRCNAME, __func__, newvalue);
+            }
+        }
       else if (sync_override && have_override
                && !strncmp (s, "IPM.Note.GpgOL", 14) && (!s[14]||s[14] =='.'))
         {

commit 1656e01d2eb19c8349dcab9d9b7e25fb85b9c854
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 30 09:39:45 2018 +0200

    Check for PGP/Inline inside of S/MIME mails
    
    * src/mapihelp.cpp
    (change_message_class_ipm_note_smime_multipartsigned): Check for
    PGP/Inline if S/MIME is disabled.
    
    --
    This is a hack to handle the case where some crypto gateway
    might wrap a PGP Inline message inside an S/MIME message.
    
    GnuPG-Bug-Id: T4115

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index ecd45f8..b01711a 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1243,6 +1243,24 @@ change_message_class_ipm_note_smime_multipartsigned (LPMESSAGE message)
               xfree (attach_mime);
             }
         }
+      else
+        {
+          /* This is enterprise level gateway encryption stuff.
+
+             E.g. we can have awesome other tools that send pgp
+             inline and a gateway that signs everything with S/MIME.
+
+             So let's look at the body to figure out if we are
+             PGP. */
+          newvalue = get_msgcls_from_pgp_lines (message);
+
+          if (newvalue)
+            {
+              log_debug ("%s:%s:   PGP Inline detected in S/MIME message. "
+                         "Type is now '%s'",
+                         SRCNAME, __func__, newvalue);
+            }
+        }
       xfree (proto);
       xfree (ct);
     }

commit 1b4138508044d7f794b23994bec6fb46c0238142
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 30 08:27:21 2018 +0200

    Fix minor german l10n error
    
    --

diff --git a/po/de.po b/po/de.po
index c392396..347e49e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: GpgOL 1.0.0\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
 "POT-Creation-Date: 2018-07-24 08:32+0200\n"
-"PO-Revision-Date: 2018-07-24 09:32+0100\n"
+"PO-Revision-Date: 2018-08-30 08:27+0100\n"
 "Last-Translator: aheinecke <aheinecke at gnupg.org>\n"
 "Language-Team: English <kde-i18n-doc at kde.org>\n"
 "Language: en_US\n"
@@ -243,7 +243,7 @@ msgid ""
 "Note: The attachments may be encrypted or signed on a file level but the "
 "GpgOL status does not apply to them."
 msgstr ""
-"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder signiert sein, "
+"Hinweis: Die Anhänge könnten auf Dateiebene verschlüsselt oder signiert sein, "
 "aber GpgOL kann deren Kryptostatus nicht anzeigen."
 
 #: src/mail.cpp:417

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

Summary of changes:
 po/de.po         |  4 ++--
 src/mapihelp.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)


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