[git] GnuPG - branch, master, updated. gnupg-2.1.13-109-g8c8ae04

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  8c8ae043b8d65cb79e0e99c5bdbdcbf34714bd0c (commit)
      from  27d158ead4a2b9c52269ef28d050a49c786c7d13 (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 8c8ae043b8d65cb79e0e99c5bdbdcbf34714bd0c
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 4 11:28:58 2016 +0200

    wks: Add command --read to gpg-wks-client.
    
    * tools/gpg-wks-client.c (aRead): New.
    (opts): Add command "--read".
    (main): Implement that.
    --
    
    This command allows to process alread decrypted Web Key Service
    messages.  It can for example be used in /etc/mailcap
    
    --8<---------------cut here---------------start------------->8---
    application/vnd.gnupg.wks; gpg-wks-client -v --read --send;\
          needsterminal; description=Web Key Service message
    --8<---------------cut here---------------end--------------->8---
    
    to allow Mutt to process confirmation requests.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index 312f58b..20dfa29 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -51,6 +51,7 @@ enum cmd_and_opt_values
 
     aCreate,
     aReceive,
+    aRead,
 
     oGpgProgram,
     oSend,
@@ -66,7 +67,9 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aCreate,   "create",
               ("create a publication request")),
   ARGPARSE_c (aReceive,   "receive",
-              ("receive a confirmation request")),
+              ("receive a MIME confirmation request")),
+  ARGPARSE_c (aRead,      "read",
+              ("receive a plain text confirmation request")),
 
   ARGPARSE_group (301, ("@\nOptions:\n ")),
 
@@ -96,6 +99,7 @@ static struct debug_flags_s debug_flags [] =
 
 static void wrong_args (const char *text) GPGRT_ATTR_NORETURN;
 static gpg_error_t command_send (const char *fingerprint, char *userid);
+static gpg_error_t process_confirmation_request (estream_t msg);
 static gpg_error_t command_receive_cb (void *opaque,
                                        const char *mediatype, estream_t fp);
 
@@ -172,6 +176,7 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
 
 	case aCreate:
 	case aReceive:
+	case aRead:
           cmd = pargs->r_opt;
           break;
 
@@ -242,12 +247,20 @@ main (int argc, char **argv)
 
     case aReceive:
       if (argc)
-        wrong_args ("--receive");
+        wrong_args ("--receive < MIME-DATA");
       err = wks_receive (es_stdin, command_receive_cb, NULL);
       if (err)
         log_error ("processing mail failed: %s\n", gpg_strerror (err));
       break;
 
+    case aRead:
+      if (argc)
+        wrong_args ("--read < WKS-DATA");
+      err = process_confirmation_request (es_stdin);
+      if (err)
+        log_error ("processing mail failed: %s\n", gpg_strerror (err));
+      break;
+
     default:
       usage (1);
       break;

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

Summary of changes:
 tools/gpg-wks-client.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org