Prepare for a new protocol.

Comment clarification.

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 3b1c10fa84d0fd1aefbbc2df2602564eedfc7b42..8cf7c4bf43049efbda5115f1d80af140bf0c783a 100644 (file)
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -766,6 +766,15 @@ This specifies the OpenPGP protocol.
 @item GPGME_PROTOCOL_CMS
 This specifies the Cryptographic Message Syntax.
 
+@item GPGME_PROTOCOL_ASSUAN
+Under development.  Please ask on @email{gnupg-devel@@gnupg.org} for help.
+
+@item GPGME_PROTOCOL_G13
+Under development.  Please ask on @email{gnupg-devel@@gnupg.org} for help.
+
+@item GPGME_PROTOCOL_UISERVER
+Under development.  Please ask on @email{gnupg-devel@@gnupg.org} for help.
+
 @item GPGME_PROTOCOL_UNKNOWN
 Reserved for future extension.  You may use this to indicate that the
 used protocol is not known to the application.  Currently,

diff --git a/src/ChangeLog b/src/ChangeLog
index bcfaa729d5d2b6eeb575d76652e0c4557bfc9436..9f6bb006d625157b9d2b4a662079b301f4709f37 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-03  Werner Koch  <wk@g10code.com>
+
+       * gpgme.h.in (GPGME_PROTOCOL_UISERVER): New.
+
 2009-11-03  Marcus Brinkmann  <marcus@g10code.de>
 
        * Makefile.am (main_sources): Change g13.c to vfs-mount.c.  Add

diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index f0a61d79796924c205823b3b659556865ce25e63..ea405bf09421ab984726a7317e855473dc2080b1 100644 (file)
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -325,6 +325,7 @@ typedef enum
     GPGME_PROTOCOL_GPGCONF = 2,  /* Special code for gpgconf.  */
     GPGME_PROTOCOL_ASSUAN  = 3,  /* Low-level access to an Assuan server.  */
     GPGME_PROTOCOL_G13     = 4,
+    GPGME_PROTOCOL_UISERVER= 5,  
     GPGME_PROTOCOL_UNKNOWN = 255
   }
 gpgme_protocol_t;

diff --git a/src/verify.c b/src/verify.c
index e930f7bbaa255888db015ac7d80afa934c00a619..41b0a0f0e4f071174ad6d247b4aa9d1d5c39852b 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -201,7 +201,7 @@ calc_sig_summary (gpgme_signature_t sig)
     sum |= GPGME_SIGSUM_BAD_POLICY;
   
   /* Set the valid flag when the signature is unquestionable
-     valid. */
+     valid.  (The test is identical to if(sum == GPGME_SIGSUM_GREEN)). */
   if ((sum & GPGME_SIGSUM_GREEN) && !(sum & ~GPGME_SIGSUM_GREEN))
     sum |= GPGME_SIGSUM_VALID;
   

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 294f7d844aac56e8ddc8f186c58732b2d2824e94..5d929a939650ba8f51f83a7db5f4dc91aab0a4e0 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-03  Werner Koch  <wk@g10code.com>
+
+       * run-support.h (fail_if_err): Include program name.
+
+       * run-sign.c (main): Add option --uiserver.
+
 2009-10-26  Marcus Brinkmann  <marcus@g10code.de>
 
        * opassuan/t-command.c: Update to new interface.

diff --git a/tests/run-sign.c b/tests/run-sign.c
index 7c3d51d7b274ff1a444d4d32cd9b030f78e9e991..b16b9ef58cd756d0452264df30dfc7df696bc795 100644 (file)
--- a/tests/run-sign.c
+++ b/tests/run-sign.c
@@ -69,6 +69,7 @@ show_usage (int ex)
          "  --verbose        run in verbose mode\n"
          "  --openpgp        use the OpenPGP protocol (default)\n"
          "  --cms            use the CMS protocol\n"
+         "  --uiserver       use the UI server\n"
          "  --key NAME       use key NAME for signing\n"
          , stderr);
   exit (ex);
@@ -115,6 +116,11 @@ main (int argc, char **argv)
           protocol = GPGME_PROTOCOL_CMS;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--uiserver"))
+        {
+          protocol = GPGME_PROTOCOL_UISERVER;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--key"))
         {
           argc--; argv++;
@@ -131,6 +137,12 @@ main (int argc, char **argv)
   if (argc != 1)
     show_usage (1);
 
+  if (key_string && protocol == GPGME_PROTOCOL_UISERVER)
+    {
+      fprintf (stderr, PGM ": ignoring --key in UI-server mode\n");
+      key_string = NULL;
+    }
+
   init_gpgme (protocol);
 
   err = gpgme_new (&ctx);
@@ -141,12 +153,10 @@ main (int argc, char **argv)
   if (key_string)
     {
       gpgme_key_t akey;
-
+      
       err = gpgme_get_key (ctx, key_string, &akey, 1);
       if (err)
         {
-          fprintf (stderr, PGM ": error getting key `%s': %s\n",
-                   key_string, gpg_strerror (err));
           exit (1);
         }
       err = gpgme_signers_add (ctx, akey);

diff --git a/tests/run-support.h b/tests/run-support.h
index 40e2beaf939663b6144a1cbc3750cb109221f1ae..d7f0923b28bd0088533819c8fcd7e60f4a0f8a26 100644 (file)
--- a/tests/run-support.h
+++ b/tests/run-support.h
@@ -38,7 +38,7 @@
     {                                                          \
       if (err)                                                 \
         {                                                      \
-          fprintf (stderr, "%s:%d: %s: %s\n",                  \
+          fprintf (stderr, PGM": file %s line %d: <%s> %s\n",  \
                    __FILE__, __LINE__, gpgme_strsource (err),  \
                   gpgme_strerror (err));                       \
           exit (1);                                            \