[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-71-g8d75228

[by NIIBE Yutaka]

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  8d7522837c6dba3065d24594bcdbe7b99a702cde (commit)
       via  20c9ac4df34e25f7085bb4e4ab5ea7223932f5c4 (commit)
       via  6e3882785a629b361c57c8b9d5cad51fb234ac23 (commit)
      from  37df3d5f593f76ddbf1b9dc6de0173b7bb85c0ad (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 8d7522837c6dba3065d24594bcdbe7b99a702cde
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Apr 26 10:23:39 2012 +0200

    make DNS and URI fields work in gpgsm --gen-key.
    
    * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
    mb_dns.avoid buffer strncpy-induced buffer overrun

diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index 236d53b..41492f5 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -339,12 +339,12 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream)
   /* DNS names.  */
   tty_printf (_("Enter DNS names"));
   tty_printf (_(" (optional; end with an empty line):\n"));
-  ask_mb_lines (&mb_email, "Name-DNS: ");
+  ask_mb_lines (&mb_dns, "Name-DNS: ");
 
   /* URIs.  */
   tty_printf (_("Enter URIs"));
   tty_printf (_(" (optional; end with an empty line):\n"));
-  ask_mb_lines (&mb_email, "Name-URI: ");
+  ask_mb_lines (&mb_uri, "Name-URI: ");
 
 
   /* Want a self-signed certificate?  */

commit 20c9ac4df34e25f7085bb4e4ab5ea7223932f5c4
Author: Jim Meyering <jim at meyering.net>
Date:   Wed Apr 25 17:42:53 2012 +0200

    avoid buffer strncpy-induced buffer overrun
    
    * dirmngr/crlcache.c (open_dir): Ensure that both this_update
    and next_update member strings are NUL-terminated.

diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index edf3837..768d446 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -587,8 +587,14 @@ open_dir (crl_cache_t *r_cache)
                 case 2: entry->issuer_hash = p; break;
                 case 3: entry->issuer = unpercent_string (p); break;
                 case 4: entry->url = unpercent_string (p); break;
-                case 5: strncpy (entry->this_update, p, 15); break;
-                case 6: strncpy (entry->next_update, p, 15); break;
+                case 5:
+		  strncpy (entry->this_update, p, 15);
+		  entry->this_update[15] = 0;
+		  break;
+                case 6:
+		  strncpy (entry->next_update, p, 15);
+		  entry->next_update[15] = 0;
+		  break;
                 case 7: entry->dbfile_hash = p; break;
                 case 8: if (*p) entry->crl_number = p; break;
                 case 9:

commit 6e3882785a629b361c57c8b9d5cad51fb234ac23
Author: Jim Meyering <jim at meyering.net>
Date:   Wed Apr 25 17:40:48 2012 +0200

    remove doubled words in a comment

diff --git a/common/gettime.h b/common/gettime.h
index 4199369..bc914ad 100644
--- a/common/gettime.h
+++ b/common/gettime.h
@@ -1,5 +1,5 @@
 /* gettime.h - Wrapper for time functions
- * Copyright (C) 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2010, 2012 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -24,8 +24,8 @@
 #include <gpg-error.h> /* We need gpg_error_t. */
 
 
-/* A type to hold the ISO time.  Note that this this is the same as
-   the the KSBA type ksba_isotime_t. */
+/* A type to hold the ISO time.  Note that this is the same as
+   the KSBA type ksba_isotime_t. */
 typedef char gnupg_isotime_t[16];
 
 time_t gnupg_get_time (void);

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

Summary of changes:
 common/gettime.h   |    6 +++---
 dirmngr/crlcache.c |   10 ++++++++--
 sm/certreqgen-ui.c |    4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)


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