[git] GnuPG - branch, master, updated. gnupg-2.1.15-42-g3d44e5e

[by Neal H. Walfield]

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  3d44e5e8a8d1d8bf6cf5d387f50d75f84d804412 (commit)
      from  f2e5cb6ffb55e49a05d452cd85e45f6f67c20abb (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 3d44e5e8a8d1d8bf6cf5d387f50d75f84d804412
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Sep 1 14:31:31 2016 +0200

    g10: When asking about a TOFU binding conflict, default to unknown.
    
    * g10/tofu.c (ask_about_binding): Default to unknown.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 2161cee..47c68fe 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1591,9 +1591,17 @@ ask_about_binding (ctrl_t ctrl,
       cpr_kill_prompt ();
       if (*response == CONTROL_L)
         tty_printf ("%s", prompt);
-      else if (strlen (response) == 1)
+      else if (!response[0])
+        /* Default to unknown.  Don't save it.  */
+        {
+          tty_printf (_("Defaulting to unknown."));
+          *policy = TOFU_POLICY_UNKNOWN;
+          break;
+        }
+      else if (!response[1])
         {
           char *choice = strchr (choices, *response);
+
           if (choice)
             {
               int c = ((size_t) choice - (size_t) choices) / 2;

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

Summary of changes:
 g10/tofu.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


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