Commit 35fe4825 authored by Sebastian Hahn's avatar Sebastian Hahn Committed by Nick Mathewson
Browse files

Quiet two notices, and spelling mistake cleanup

parent 66200320

src/common/tortls.c

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_cert_t *cert) 
  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>,

 * 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

src/or/command.c

+2 −2
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) 
                      conn->handshake_state->authenticated_peer_id) < 0)

      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);



    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");





    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.",

             safe_str(conn->_base.address), conn->_base.port);

    /* XXXX check more stuff? */

src/or/connection_or.c

+2 −2
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ connection_tls_continue_handshake(or_connection_t *conn) 
        if (!tor_tls_is_server(conn->tls)) {

          if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {

            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.");

              return connection_or_launch_v3_or_handshake(conn);

            } else {
@@ -1241,7 +1241,7 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event, 
      if (!tor_tls_is_server(conn->tls)) {

        if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {

          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)

              connection_mark_for_close(TO_CONN(conn));

            return;

src/or/or.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ typedef enum { 
 * haven't yet negotiated link protocol versions, done a V3 handshake, and

 * sent a netinfo cell. */

#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_MAX 8