security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

dirmngr: Let Libassuan employ nPth wrappers for connect.

Browse Source 
* dirmngr/http.c (my_unprotect, my_protect): Remove.
(connect_server): Do not use these wrappers.
--

Since Libassuan version 2.4.2 the macro ASSUAN_SYSTEM_NPTH_IMPL
protects the low-level connect calls with npth_unprotect and
npth_protect.  This is better than the high-level kludge we used here.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-11-26 17:15:08 +01:00
parent 676b2d7081
commit f95cff1cc9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dirmngr/http.c
View File

@ -105,13 +105,9 @@
#ifdef USE_NPTH #ifdef USE_NPTH
# define my_select(a,b,c,d,e) npth_select ((a), (b), (c), (d), (e)) # define my_select(a,b,c,d,e) npth_select ((a), (b), (c), (d), (e))
# define my_accept(a,b,c) npth_accept ((a), (b), (c)) # define my_accept(a,b,c) npth_accept ((a), (b), (c))
# define my_unprotect() npth_unprotect ()
# define my_protect() npth_protect ()
#else #else
# define my_select(a,b,c,d,e) select ((a), (b), (c), (d), (e)) # define my_select(a,b,c,d,e) select ((a), (b), (c), (d), (e))
# define my_accept(a,b,c) accept ((a), (b), (c)) # define my_accept(a,b,c) accept ((a), (b), (c))
# define my_unprotect() do { } while(0)
# define my_protect() do { } while(0)
#endif #endif
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
@ -2228,11 +2224,8 @@ connect_server (const char *server, unsigned short port,
{ {
#ifdef ASSUAN_SOCK_TOR #ifdef ASSUAN_SOCK_TOR
my_unprotect ();
sock = assuan_sock_connect_byname (server, port, 0, NULL, sock = assuan_sock_connect_byname (server, port, 0, NULL,
ASSUAN_SOCK_TOR); ASSUAN_SOCK_TOR);
my_protect ();
if (sock == ASSUAN_INVALID_FD) if (sock == ASSUAN_INVALID_FD)
{ {
if (errno == EHOSTUNREACH) if (errno == EHOSTUNREACH)
@ -2327,9 +2320,7 @@ connect_server (const char *server, unsigned short port,
} }
anyhostaddr = 1; anyhostaddr = 1;
my_unprotect ();
ret = assuan_sock_connect (sock, ai->addr, ai->addrlen); ret = assuan_sock_connect (sock, ai->addr, ai->addrlen);
my_protect ();
if (ret) if (ret)
last_errno = errno; last_errno = errno;
else else