[svn] GpgOL - r293 - in trunk: . po src

[svn author wk]

Author: wk
Date: 2009-01-28 11:08:26 +0100 (Wed, 28 Jan 2009)
New Revision: 293

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/po/de.po
   trunk/po/sv.po
   trunk/src/ChangeLog
   trunk/src/mimeparser.c
Log:
Fix for OL created S/MIME signed mails.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-16 17:50:09 UTC (rev 292)
+++ trunk/ChangeLog	2009-01-28 10:08:26 UTC (rev 293)
@@ -1,3 +1,9 @@
+2009-01-28  Werner Koch  <wk at g10code.com>
+
+	Release 0.10.18.
+
+	* po/de.po: s/Unterschrift/Signatur/.
+
 2008-11-14  Werner Koch  <wk at g10code.com>
 
 	Release 0.10.17.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-01-16 17:50:09 UTC (rev 292)
+++ trunk/src/ChangeLog	2009-01-28 10:08:26 UTC (rev 293)
@@ -1,3 +1,9 @@
+2009-01-28  Werner Koch  <wk at g10code.com>
+
+	* mimeparser.c (t2body): Take care of x-pkcs7-mime as used by
+	native OL signed messages.
+	(mime_decrypt): Ditto.
+
 2009-01-16  Werner Koch  <wk at g10code.com>
 
 	* engine-assuan.c (attach_thread_input_wndw_proc) 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-01-16 17:50:09 UTC (rev 292)
+++ trunk/NEWS	2009-01-28 10:08:26 UTC (rev 293)
@@ -1,7 +1,9 @@
-Noteworthy changes for version 0.10.18 (unreleased)
+Noteworthy changes for version 0.10.18 (2009-01-28)
 ===================================================
 
+ * Handle OL created S/MIME messages.
 
+
 Noteworthy changes for version 0.10.17 (2008-11-14)
 ===================================================
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-01-16 17:50:09 UTC (rev 292)
+++ trunk/configure.ac	2009-01-28 10:08:26 UTC (rev 293)
@@ -17,7 +17,7 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [0.10.18])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))

Modified: trunk/po/de.po  [not shown]
Modified: trunk/po/sv.po  [not shown]
Modified: trunk/src/mimeparser.c
===================================================================
--- trunk/src/mimeparser.c	2009-01-16 17:50:09 UTC (rev 292)
+++ trunk/src/mimeparser.c	2009-01-28 10:08:26 UTC (rev 293)
@@ -864,7 +864,9 @@
       /* Check whether this attachment is an opaque signed S/MIME
          part.  We use a counter to later check that there is only one
          such part. */
-      if (!strcmp (ctmain, "application") && !strcmp (ctsub, "pkcs7-mime"))
+      if (!strcmp (ctmain, "application")
+          && (!strcmp (ctsub, "pkcs7-mime")
+              || !strcmp (ctsub, "x-pkcs7-mime")))
         {
           const char *smtype = rfc822parse_query_parameter (field,
                                                             "smime-type", 0);
@@ -1986,7 +1988,9 @@
       for (i=0; !table[i].end_of_table; i++)
         if (table[i].attach_type == ATTACHTYPE_FROMMOSS
             && table[i].content_type               
-            && !strcmp (table[i].content_type, "application/pkcs7-mime"))
+            && (!strcmp (table[i].content_type, "application/pkcs7-mime")
+                || !strcmp (table[i].content_type, "application/x-pkcs7-mime"))
+            )
           break;
       if (table[i].end_of_table)
         {