[git] GnuPG - branch, master, updated. gnupg-2.1.21-137-g45e4048

[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  45e40487fb7bb51228c96c8966e38c643a9b9ba5 (commit)
       via  ade4b2744c848e07b87afa4f186256c2a2ef1d13 (commit)
      from  789401e9557db13422f47a8c09e693f3cee0132b (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 45e40487fb7bb51228c96c8966e38c643a9b9ba5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 24 16:10:22 2017 +0900

    scd: Use unsigned int for fields.
    
    * scd/app-openpgp.c (data_objects): Use unsigned ints.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 2d53b84..365f246 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -76,16 +76,16 @@ static struct {
   int tag;
   int constructed;
   int get_from;  /* Constructed DO with this DO or 0 for direct access. */
-  int binary:1;
-  int dont_cache:1;
-  int flush_on_error:1;
-  int get_immediate_in_v11:1; /* Enable a hack to bypass the cache of
+  unsigned int binary:1;
+  unsigned int dont_cache:1;
+  unsigned int flush_on_error:1;
+  unsigned int get_immediate_in_v11:1; /* Enable a hack to bypass the cache of
                                  this data object if it is used in 1.1
                                  and later versions of the card.  This
                                  does not work with composite DO and
                                  is currently only useful for the CHV
                                  status bytes. */
-  int try_extlen:2;           /* Large object; try to use an extended
+  unsigned int try_extlen:2;           /* Large object; try to use an extended
                                  length APDU when !=0.  The size is
                                  determined by extcap.max_certlen_3
                                  when == 1, and by extcap.max_special_do

commit ade4b2744c848e07b87afa4f186256c2a2ef1d13
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 24 16:09:11 2017 +0900

    dirmngr: More minor fix.
    
    * dirmngr/http.c (send_request): Care the case of !USE_TLS.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/http.c b/dirmngr/http.c
index b16de7d..63ed5d3 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -1672,7 +1672,9 @@ send_request (http_t hd, const char *httphost, const char *auth,
   char *proxy_authstr = NULL;
   char *authstr = NULL;
   assuan_fd_t sock;
+#ifdef USE_TLS
   int have_http_proxy = 0;
+#endif
 
   if (hd->uri->use_tls && !hd->session)
     {
@@ -1759,8 +1761,10 @@ send_request (http_t hd, const char *httphost, const char *auth,
 
       if (err)
         ;
+#ifdef USE_TLS
       else if (!strcmp (uri->scheme, "http"))
         have_http_proxy = 1;
+#endif
       else if (!strcmp (uri->scheme, "socks4")
                || !strcmp (uri->scheme, "socks5h"))
         err = gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);

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

Summary of changes:
 dirmngr/http.c    |  4 ++++
 scd/app-openpgp.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


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