doc/

2005-04-28  Marcus Brinkmann  <marcus@g10code.de>

        * gpgme.texi (Included Certificates): Document
        GPGME_INCLUDE_CERTS_DEFAULT.

gpgme/
2005-04-28  Marcus Brinkmann  <marcus@g10code.de>

        * gpgme.h (GPGME_INCLUDE_CERTS_DEFAULT): New macro.
        * engine-gpgsm.c (gpgsm_sign): Send the include-certs option after
        the reset, just for cleanliness, and do not sent it at all if the
        default is requested.
        * gpgme.c (gpgme_set_include_certs): Allow to use
        GPGME_INCLUDE_CERTS_DEFAULT.

diff --git a/NEWS b/NEWS
index 221ec476761529297f01461b6eb7c6f6bd7a8951..431b1e19661a137946c1dea5b8e29362696ab8f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,21 @@ Noteworthy changes in version 1.1.0 (unreleased)
  * You can now configure the backend engine file name and home
    directory to be used, as default and per context.
 
+ * Previousy, GPGME would use a default "include certs" of 1.  This
+   has been changed.  Now GPGME will use the crypto backend engines
+   default unless you set the value with gpgme_set_include_certs()
+   explicitely.  A new macro GPGME_INCLUDE_CERTS_DEFAULT can be used
+   as a value to explicitely request the new default behaviour.
+
+   Because the default changes, this is a slight change of the API
+   semantics.  We consider it to be a bug fix.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gpgme_set_engine_info          NEW
 gpgme_ctx_get_engine_info      NEW
 gpgme_ctx_set_engine_info      NEW
+gpgme_set_include_certs                CHANGED DEFAULT
+GPGME_INCLUDE_CERTS_DEFAULT    NEW
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d53f017ba3485f690bb8a6305f6275472b52bc75..5061d3a3180c3a794eb71a04a0117963666720c4 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-28  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.texi (Included Certificates): Document
+       GPGME_INCLUDE_CERTS_DEFAULT.
+
 2005-01-12  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.texi (Engine Configuration): New section.

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index f68b41be2a78b2e89f0c49edd781298bb535d133..9c6b42fb209db8f597011004280944e8cec538d8 100644 (file)
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2028,6 +2028,9 @@ default, only the sender's certificate is included.  The possible
 values of @var{nr_of_certs} are:
 
 @table @code
+@item GPGME_INCLUDE_CERTS_DEFAULT
+Fall back to the default of the crypto backend.  This is the default
+for GPGME.
 @item -2
 Include all certificates except the root certificate.
 @item -1

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 0a4a9ae2517d5f2fe837e8639c38ab20450be774..275db84b9797e5e3a2a65150dace7439c8476b49 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-28  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.h (GPGME_INCLUDE_CERTS_DEFAULT): New macro.
+       * engine-gpgsm.c (gpgsm_sign): Send the include-certs option after
+       the reset, just for cleanliness, and do not sent it at all if the
+       default is requested.
+       * gpgme.c (gpgme_set_include_certs): Allow to use
+       GPGME_INCLUDE_CERTS_DEFAULT.
+
 2005-04-21  Werner Koch  <wk@g10code.com>
 
        * verify.c (calc_sig_summary): Set the key revoked bit.

diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index ea6ccc74c4de093c0b40404275c76542c5bbadd8..c96be8888653a1b3b33827c8d95a151552b325dc 100644 (file)
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -1437,19 +1437,27 @@ gpgsm_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
   if (!gpgsm)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  if (asprintf (&assuan_cmd, "OPTION include-certs %i", include_certs) < 0)
-    return gpg_error_from_errno (errno);
-  err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, assuan_cmd, NULL,NULL);
-  free (assuan_cmd);
-  if (err)
-    return err;
-
   /* We must send a reset because we need to reset the list of
      signers.  Note that RESET does not reset OPTION commands. */
   err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, "RESET", NULL, NULL);
   if (err)
     return err;
 
+  if (include_certs != GPGME_INCLUDE_CERTS_DEFAULT)
+    {
+      /* FIXME: Make sure that if we run multiple operations, that we
+        can reset any previously set value in case the default is
+        requested.  */
+
+      if (asprintf (&assuan_cmd, "OPTION include-certs %i", include_certs) < 0)
+       return gpg_error_from_errno (errno);
+      err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, assuan_cmd,
+                                        NULL, NULL);
+      free (assuan_cmd);
+      if (err)
+       return err;
+    }
+
   for (i = 0; (key = gpgme_signers_enum (ctx, i)); i++)
     {
       const char *s = key->subkeys ? key->subkeys->fpr : NULL;

diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c
index 9e5171c9ae3756c7994eefb5a0f2f6842c81551a..5eb40bea57fc5635bc5a3a3f2c287af18aaa2304 100644 (file)
--- a/gpgme/gpgme.c
+++ b/gpgme/gpgme.c
@@ -222,12 +222,14 @@ gpgme_get_textmode (gpgme_ctx_t ctx)
 
 
 /* Set the number of certifications to include in an S/MIME message.
-   The default is 1 (only the cert of the sender).  -1 means all
-   certs, and -2 means all certs except the root cert.  */
+   The default is GPGME_INCLUDE_CERTS_DEFAULT.  -1 means all certs,
+   and -2 means all certs except the root cert.  */
 void
 gpgme_set_include_certs (gpgme_ctx_t ctx, int nr_of_certs)
 {
-  if (nr_of_certs < -2)
+  if (nr_of_certs == GPGME_INCLUDE_CERTS_DEFAULT)
+    ctx->include_certs = GPGME_INCLUDE_CERTS_DEFAULT;
+  else if (nr_of_certs < -2)
     ctx->include_certs = -2;
   else
     ctx->include_certs = nr_of_certs;

diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 3db2d972280c3209d323bac029a3b32256dd0d78..c3f5123b8cfc4e594fbbfdb75a3963ec9385b36f 100644 (file)
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -706,6 +706,9 @@ void gpgme_set_textmode (gpgme_ctx_t ctx, int yes);
 /* Return non-zero if text mode is set in CTX.  */
 int gpgme_get_textmode (gpgme_ctx_t ctx);
 
+/* Use whatever the default of the backend crypto engine is.  */
+#define GPGME_INCLUDE_CERTS_DEFAULT    -256
+
 /* Include up to NR_OF_CERTS certificates in an S/MIME message.  */
 void gpgme_set_include_certs (gpgme_ctx_t ctx, int nr_of_certs);