Commit 69f66b96 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'origin/maint-0.2.4'

parents d8f5c5b8 0bfaf866

changes/bug8879

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Follow the socks5 protocol when offering username/password

      authentication. The fix for bug 8117 exposed this bug, and it

      turns out real-world applications like Pidgin do care. Bugfix on

      0.2.3.2-alpha; fixes bug 8879.

src/or/buffers.c

+1 −1
Original line number Diff line number Diff line
@@ -1751,7 +1751,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, 
        return 0;

      }

      req->replylen = 2; /* 2 bytes of response */

      req->reply[0] = 5;

      req->reply[0] = 1; /* authversion == 1 */

      req->reply[1] = 0; /* authentication successful */

      log_debug(LD_APP,

               "socks5: Accepted username/password without checking.");