diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-05-10 11:50:14 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-05-10 11:50:14 -0400 |
commit | 8c09923f20379619adc58765a795920435a96822 (patch) | |
tree | a7bbd8bc6cddfb82b1e30f1b57a5410208d53659 /src/or/control.c | |
parent | 98a30daf34068d629652ab070b1ef50cbe8f0733 (diff) | |
parent | 5bbf04dc9727de393ab1c42440124d875c79c13e (diff) | |
download | tor-8c09923f20379619adc58765a795920435a96822.tar.gz tor-8c09923f20379619adc58765a795920435a96822.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/control.c b/src/or/control.c index 397bb53ab4..ec0bb8a7c1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2986,13 +2986,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -3003,7 +3003,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -3017,7 +3017,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce); @@ -3030,7 +3030,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce); |