diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-09-30 21:10:56 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-09-30 21:10:56 +0200 |
| commit | c3a748571ed19f9259b2e63cd7ba56abdb1b7747 (patch) | |
| tree | ef419b35f5a1632a8b0c3ab6faa773eed9c6788a /src/openvpn/socks.c | |
| parent | b97ad09a3b8c0017db0a677667a7215f1a98cccf (diff) | |
| parent | 5246174f27866c0e9e22844d998f3c97cac54050 (diff) | |
Update upstream source from tag 'upstream/2.5_rc2'
Update to upstream version '2.5~rc2'
with Debian dir 0cd2307abadc06f5064e4d5e7c23689a67b720c5
Diffstat (limited to 'src/openvpn/socks.c')
| -rw-r--r-- | src/openvpn/socks.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 57f0cee..36df747 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -312,7 +312,7 @@ recv_socks_reply(socket_descriptor_t sd, char atyp = '\0'; int alen = 0; int len = 0; - char buf[22]; + char buf[270]; /* 4 + alen(max 256) + 2 */ const int timeout_sec = 5; if (addr != NULL) @@ -381,7 +381,10 @@ recv_socks_reply(socket_descriptor_t sd, break; case '\x03': /* DOMAINNAME */ - alen = (unsigned char) c; + /* RFC 1928, section 5: 1 byte length, <n> bytes name, + * so the total "address length" is (length+1) + */ + alen = (unsigned char) c + 1; break; case '\x04': /* IP V6 */ @@ -451,7 +454,7 @@ establish_socks_proxy_passthru(struct socks_proxy_info *p, const char *servname, /* openvpn server port */ volatile int *signal_received) { - char buf[128]; + char buf[270]; size_t len; if (!socks_handshake(p, sd, signal_received)) |