[Pkg-gnupg-commit] [gnupg2] 108/185: dirmngr: Fix handling of proxy URIs.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 73d4781e4595634548269bafe46aeb7674c5b219
Author: Justus Winter <justus at g10code.com>
Date:   Tue Jul 18 17:24:21 2017 +0200

    dirmngr: Fix handling of proxy URIs.
    
    * dirmngr/http.c (send_request): We do not support socks4.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 dirmngr/http.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dirmngr/http.c b/dirmngr/http.c
index 0cb2708..b5b0e9d 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -1756,9 +1756,10 @@ send_request (http_t hd, const char *httphost, const char *auth,
 
       if (err)
         ;
-      else if (!strcmp (uri->scheme, "http") || !strcmp (uri->scheme, "socks4"))
+      else if (!strcmp (uri->scheme, "http"))
         ;
-      else if (!strcmp (uri->scheme, "socks5h"))
+      else if (!strcmp (uri->scheme, "socks4")
+               || !strcmp (uri->scheme, "socks5h"))
         err = gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
       else
         err = gpg_err_make (default_errsource, GPG_ERR_INV_URI);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git