Include the protocol parameter of multipart/.. content-type messages into double...

diff --git a/gpgmeplug/gpgme-openpgp.c b/gpgmeplug/gpgme-openpgp.c
index 56908e1b475c7d549969153e8cd6ed3654705db1..e0bd16398d2df54ca8f23bccf09d3aa6455b0027 100644 (file)
--- a/gpgmeplug/gpgme-openpgp.c
+++ b/gpgmeplug/gpgme-openpgp.c
@@ -3,7 +3,7 @@
 #define GPGMEPLUG_SIGN_INCLUDE_CLEARTEXT true
 #define GPGMEPLUG_SIGN_MAKE_MIME_OBJECT  true
 #define GPGMEPLUG_SIGN_MAKE_MULTI_MIME   true
-#define GPGMEPLUG_SIGN_CTYPE_MAIN        "multipart/signed;protocol=application/pgp-signature;micalg=pgp-sha1"
+#define GPGMEPLUG_SIGN_CTYPE_MAIN        "multipart/signed;protocol=\"application/pgp-signature\";micalg=pgp-sha1"
 #define GPGMEPLUG_SIGN_CDISP_MAIN        ""
 #define GPGMEPLUG_SIGN_CTENC_MAIN        ""
 #define GPGMEPLUG_SIGN_CTYPE_VERSION     ""
@@ -21,7 +21,7 @@
 #define GPGMEPLUG_ENC_INCLUDE_CLEARTEXT  false
 #define GPGMEPLUG_ENC_MAKE_MIME_OBJECT   true
 #define GPGMEPLUG_ENC_MAKE_MULTI_MIME    true
-#define GPGMEPLUG_ENC_CTYPE_MAIN         "multipart/encrypted; protocol=application/pgp-encrypted"
+#define GPGMEPLUG_ENC_CTYPE_MAIN         "multipart/encrypted; protocol=\"application/pgp-encrypted\""
 #define GPGMEPLUG_ENC_CDISP_MAIN         ""
 #define GPGMEPLUG_ENC_CTENC_MAIN         ""
 #define GPGMEPLUG_ENC_CTYPE_VERSION      "application/pgp-encrypted"

diff --git a/gpgmeplug/gpgme-smime.c b/gpgmeplug/gpgme-smime.c
index e6c85349653635c1b110387edd59bf5bd366ed50..39b53e8ede34a1f809dafd9365c736962b7d668c 100644 (file)
--- a/gpgmeplug/gpgme-smime.c
+++ b/gpgmeplug/gpgme-smime.c
@@ -3,7 +3,7 @@
 #define GPGMEPLUG_SIGN_INCLUDE_CLEARTEXT true
 #define GPGMEPLUG_SIGN_MAKE_MIME_OBJECT  true
 #define GPGMEPLUG_SIGN_MAKE_MULTI_MIME   true
-#define GPGMEPLUG_SIGN_CTYPE_MAIN        "multipart/signed; protocol=application/pkcs7-signature; micalg=sha1"
+#define GPGMEPLUG_SIGN_CTYPE_MAIN        "multipart/signed; protocol=\"application/pkcs7-signature\"; micalg=sha1"
 #define GPGMEPLUG_SIGN_CDISP_MAIN        ""
 #define GPGMEPLUG_SIGN_CTENC_MAIN        ""
 #define GPGMEPLUG_SIGN_CTYPE_VERSION     ""

diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 12cf2009ae6199455a8e25ef20dcc0da471f5064..0132a67ed74d546c8b5ebf7b015492c6ce60a309 100644 (file)
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -452,11 +452,31 @@ bool signatureCertificateExpiryNearWarning( void )
 
 int signatureCertificateDaysLeftToExpiry( const char* certificate )
 {
-    /* PENDING(g10)
-       Please return the number of days that are left until the
-       certificate specified in the parameter certificate expires.
-    */
-  return 10; /* dummy that triggers a warning in the MUA */
+  GpgmeCtx ctx;
+  GpgmeError err;
+  GpgmeKey rKey;
+  time_t daysLeft = 0;
+
+  gpgme_new( &ctx );
+  gpgme_set_protocol( ctx, GPGMEPLUG_PROTOCOL );
+
+  err = gpgme_op_keylist_start( ctx, certificate, 0 );
+  if ( GPGME_No_Error == err ) {
+    err = gpgme_op_keylist_next( ctx, &rKey );
+    gpgme_op_keylist_end( ctx );
+    if ( GPGME_No_Error == err ) {
+      time_t expire_time = gpgme_key_get_ulong_attr(
+                             rKey,GPGME_ATTR_EXPIRE, NULL, 0 );
+      time_t cur_time = time (NULL);
+      daysLeft = expire_time - cur_time;
+      // convert seconds into days
+      daysLeft /= 43200;
+      gpgme_key_release( rKey );
+    }
+  }
+  gpgme_release( ctx );
+
+  return daysLeft;
 }