[git] GpgOL - branch, master, updated. gpgol-2.2.0-167-g173a8a5

[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  173a8a5f416ce85ae8de0334cc48a61bb4df7840 (commit)
       via  d063cd7c55c7a07a6c9fc4ae5029bce4421fe0eb (commit)
      from  223014d35805145d262aa153f2be2a882eaf1207 (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 173a8a5f416ce85ae8de0334cc48a61bb4df7840
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 30 14:41:16 2018 +0200

    Revert "Check for PGP/Inline inside of S/MIME mails"
    
    This reverts commit 1656e01d2eb19c8349dcab9d9b7e25fb85b9c854.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index da7675e..562a903 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1243,24 +1243,6 @@ 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 d063cd7c55c7a07a6c9fc4ae5029bce4421fe0eb
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 30 14:41:08 2018 +0200

    Revert "Also check for pgp/inline in IPM.Note.SMIME"
    
    This reverts commit 0e05606f693114b491a74030e7ae54c75738eeae.

diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
index d9e276d..da7675e 100644
--- a/src/mapihelp.cpp
+++ b/src/mapihelp.cpp
@@ -1506,29 +1506,6 @@ 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] =='.'))
         {

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

Summary of changes:
 src/mapihelp.cpp | 41 -----------------------------------------
 1 file changed, 41 deletions(-)


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