PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-18 12:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Add SOCKS5 support for SOCKS5_ATYP_NAME bind address. Closes #2365

Browse Source
This commit is contained in:
nnposter
2021-10-10 01:12:57 +00:00
parent e2f58045df
commit 972ed6bac0
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -3,6 +3,9 @@
o [Ncat] Fix hostname/certificate comparison and matching to handle ASN.1
strings without null terminators, a similar bug to OpenSSL's CVE-2021-3712.
o [Ncat][GH#2365] Added support for SOCKS5 proxies that return bind addresses
as hostnames, instead of IPv4/IPv6 addresses. [pomu0325]
Nmap 7.92 [2021-08-07]
o [Windows] Upgraded Npcap (our Windows raw packet capturing and

10
ncat/ncat_connect.c
View File

@@ -660,7 +660,7 @@ static int do_proxy_socks5(void)
size_t addrlen;
char addrstr[INET6_ADDRSTRLEN];
size_t bndaddrlen;
char bndaddr[16 + 2]; /* IPv4/IPv6 address and port */
char bndaddr[SOCKS5_DST_MAXLEN + 2]; /* IPv4/IPv6/hostname and port */
size_t remainderlen;
char* remainder;
@@ -919,6 +919,14 @@ static int do_proxy_socks5(void)
case SOCKS5_ATYP_IPv6:
bndaddrlen = 16 + 2;
break;
case SOCKS5_ATYP_NAME:
if (socket_buffer_readcount(&stateful_buf, socksbuf, 1) < 0) {
loguser("Error: malformed request response from proxy.\n");
close(sd);
return -1;
}
bndaddrlen = (unsigned char)socksbuf[0] + 2;
break;
default:
loguser("Error: invalid proxy bind address type.\n");
close(sd);