[git] GnuPG - branch, master, updated. gnupg-2.1.18-141-gf5782e1

[by Daniel Kahn Gillmor]

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  f5782e11a560fd590221042391254c810a42e45f (commit)
       via  ddf01a67d6388d988f1db50a06facb21c14d9426 (commit)
       via  64ec21bebd3f136722e608649906b59c6add6947 (commit)
      from  55b6c2595a97346895ed42bcc8b72151792f5bd8 (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 f5782e11a560fd590221042391254c810a42e45f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Feb 25 22:54:47 2017 -0800

    dirmngr: Avoid warnings during non-ntbtls build.
    
    * dirmngr/t-http.c (my_http_tls_verify_cb): Avoid warnings when not
    using ntbtls.
    
    --
    
    Without this patch, when building without ntbtls, we see the following
    warnings during "make check":
    
    t-http.c: In function ‘my_http_tls_verify_cb’:
    t-http.c:141:16: warning: implicit declaration of function
          ‘ntbtls_x509_get_peer_cert’ [-Wimplicit-function-declaration]
            (cert = ntbtls_x509_get_peer_cert (tls_context, idx)); idx++)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~
    t-http.c:141:14: warning: assignment makes pointer from integer
           without a cast  -Wint-conversion]
            (cert = ntbtls_x509_get_peer_cert (tls_context, idx)); idx++)
                  ^
    At top level:
    t-http.c:123:1: warning: ‘my_http_tls_verify_cb’ defined but not
          used [-Wunused-function]
     my_http_tls_verify_cb (void *opaque,
     ^~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c
index 68818de..35f5947 100644
--- a/dirmngr/t-http.c
+++ b/dirmngr/t-http.c
@@ -118,7 +118,7 @@ my_gnutls_log (int level, const char *text)
 }
 #endif
 
-
+#if HTTP_USE_NTBTLS
 static gpg_error_t
 my_http_tls_verify_cb (void *opaque,
                        http_t http,
@@ -165,6 +165,7 @@ my_http_tls_verify_cb (void *opaque,
   log_info ("my_http_tls_verify_cb returns: %s\n", gpg_strerror (err));
   return err;
 }
+#endif /*HTTP_USE_NTBTLS*/
 
 
 

commit ddf01a67d6388d988f1db50a06facb21c14d9426
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Feb 25 18:02:27 2017 -0500

    trustdb: Respect --quiet during --import-ownertrust.
    
    * g10/tdbdump.c (import_ownertrust): If opt.quiet is set, do not send
    log_info messages.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 41a0258..be9d1f2 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -193,18 +193,22 @@ import_ownertrust( const char *fname )
 	if( !rc ) { /* found: update */
 	    if (rec.r.trust.ownertrust != otrust)
               {
-                if( rec.r.trust.ownertrust )
-                  log_info("changing ownertrust from %u to %u\n",
-                           rec.r.trust.ownertrust, otrust );
-                else
-                  log_info("setting ownertrust to %u\n", otrust );
+                if (!opt.quiet)
+                  {
+                    if( rec.r.trust.ownertrust )
+                      log_info("changing ownertrust from %u to %u\n",
+                               rec.r.trust.ownertrust, otrust );
+                    else
+                      log_info("setting ownertrust to %u\n", otrust );
+                  }
                 rec.r.trust.ownertrust = otrust;
                 write_record (&rec );
                 any = 1;
               }
 	}
 	else if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND) { /* insert */
-            log_info("inserting ownertrust of %u\n", otrust );
+            if (!opt.quiet)
+              log_info("inserting ownertrust of %u\n", otrust );
             memset (&rec, 0, sizeof rec);
             rec.recnum = tdbio_new_recnum ();
             rec.rectype = RECTYPE_TRUST;

commit 64ec21bebd3f136722e608649906b59c6add6947
Author: Manish Goregaokar <manish at mozilla.com>
Date:   Fri Feb 24 22:05:15 2017 -0800

    g10: fix typo
    
    I already have copyright assignment with the FSF for GDB. I don't
    think I'll need to do the DCO thing.
    
    Signed-off-by: Manish Goregaokar <manish at mozilla.com>

diff --git a/g10/keygen.c b/g10/keygen.c
index 844d38d..226cabd 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -5149,7 +5149,7 @@ generate_card_subkeypair (kbnode_t pub_keyblock,
   node = find_kbnode (pub_keyblock, PKT_PUBLIC_KEY);
   if (!node)
     {
-      log_error ("Oops; publkic key lost!\n");
+      log_error ("Oops; public key lost!\n");
       err = gpg_error (GPG_ERR_INTERNAL);
       goto leave;
     }

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

Summary of changes:
 dirmngr/t-http.c |  3 ++-
 g10/keygen.c     |  2 +-
 g10/tdbdump.c    | 16 ++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)


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