diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-10-28 19:46:08 +0100 |
| commit | 8231554c9f1ba25cb4e698ad5cfb3a56b258610a (patch) | |
| tree | 029108888123856ca13e34c612d4dd4845c2b6c3 /src/openvpn/socks.c | |
| parent | 5bac5f7608a14e0989e95db1a1da2e65d9322127 (diff) | |
| parent | 76fee93e6fe89e5575bae2840b585d2f025b9050 (diff) | |
Merge tag 'debian/2.5.0-1' into buster-backports
openvpn Debian release 2.5.0-1
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)) |