nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quiet two notices, and spelling mistake cleanup

Browse Source
This commit is contained in:
Sebastian Hahn 2011-10-11 04:24:33 +02:00 committed by Nick Mathewson
parent 66200320ff
commit 35fe4825fc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/tortls.c
View File

@ -936,7 +936,7 @@ tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_cert_t *cert)
return result; return result;
} }
/** Check wither <b>cert</b> is well-formed, currently live, and correctly /** Check whether <b>cert</b> is well-formed, currently live, and correctly
* signed by the public key in <b>signing_cert</b>. If <b>check_rsa_1024</b>, * signed by the public key in <b>signing_cert</b>. If <b>check_rsa_1024</b>,
* make sure that it has an RSA key with 1024 bits; otherwise, just check that * make sure that it has an RSA key with 1024 bits; otherwise, just check that
* the key is long enough. Return 1 if the cert is good, and 0 if it's bad or * the key is long enough. Return 1 if the cert is good, and 0 if it's bad or

4
src/or/command.c
View File

@ -992,7 +992,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn)
conn->handshake_state->authenticated_peer_id) < 0) conn->handshake_state->authenticated_peer_id) < 0)
ERR("Problem setting or checking peer id"); ERR("Problem setting or checking peer id");
log_info(LD_OR, "Got some good certifcates from %s:%d: Authenticated it.", log_info(LD_OR, "Got some good certificates from %s:%d: Authenticated it.",
safe_str(conn->_base.address), conn->_base.port); safe_str(conn->_base.address), conn->_base.port);
conn->handshake_state->id_cert = id_cert; conn->handshake_state->id_cert = id_cert;
@ -1010,7 +1010,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn)
ERR("The ID certificate was not valid"); ERR("The ID certificate was not valid");
log_info(LD_OR, "Got some good certifcates from %s:%d: " log_info(LD_OR, "Got some good certificates from %s:%d: "
"Waiting for AUTHENTICATE.", "Waiting for AUTHENTICATE.",
safe_str(conn->_base.address), conn->_base.port); safe_str(conn->_base.address), conn->_base.port);
/* XXXX check more stuff? */ /* XXXX check more stuff? */

4
src/or/connection_or.c
View File

@ -1181,7 +1181,7 @@ connection_tls_continue_handshake(or_connection_t *conn)
if (!tor_tls_is_server(conn->tls)) { if (!tor_tls_is_server(conn->tls)) {
if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) { if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {
if (tor_tls_received_v3_certificate(conn->tls)) { if (tor_tls_received_v3_certificate(conn->tls)) {
log_notice(LD_OR, "Client got a v3 cert! Moving on to v3 " log_info(LD_OR, "Client got a v3 cert! Moving on to v3 "
"handshake."); "handshake.");
return connection_or_launch_v3_or_handshake(conn); return connection_or_launch_v3_or_handshake(conn);
} else { } else {
@ -1241,7 +1241,7 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event,
if (!tor_tls_is_server(conn->tls)) { if (!tor_tls_is_server(conn->tls)) {
if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) { if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {
if (tor_tls_received_v3_certificate(conn->tls)) { if (tor_tls_received_v3_certificate(conn->tls)) {
log_notice(LD_OR, "Client got a v3 cert!"); log_info(LD_OR, "Client got a v3 cert!");
if (connection_or_launch_v3_or_handshake(conn) < 0) if (connection_or_launch_v3_or_handshake(conn) < 0)
connection_mark_for_close(TO_CONN(conn)); connection_mark_for_close(TO_CONN(conn));
return; return;

2
src/or/or.h
View File

@ -301,7 +301,7 @@ typedef enum {
* haven't yet negotiated link protocol versions, done a V3 handshake, and * haven't yet negotiated link protocol versions, done a V3 handshake, and
* sent a netinfo cell. */ * sent a netinfo cell. */
#define OR_CONN_STATE_OR_HANDSHAKING_V3 7 #define OR_CONN_STATE_OR_HANDSHAKING_V3 7
/** State for an OR connection:: Ready to send/receive cells. */ /** State for an OR connection: Ready to send/receive cells. */
#define OR_CONN_STATE_OPEN 8 #define OR_CONN_STATE_OPEN 8
#define _OR_CONN_STATE_MAX 8 #define _OR_CONN_STATE_MAX 8