commit a9720b90f860323781d37dbba6ce04f312ec3632 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 30 08:35:02 2014 -0400

Fix whitespace from tor_x509_cert rename --- src/common/tortls.c | 4 ++-- src/common/tortls.h | 3 ++- src/or/connection_or.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c index b4d50cd..97dca4d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -880,8 +880,8 @@ tor_x509_cert_new(X509 *x509_cert) }

/** Read a DER-encoded X509 cert, of length exactly <b>certificate_len</b>, - * from a <b>certificate</b>. Return a newly allocated tor_x509_cert_t on success - * and NULL on failure. */ + * from a <b>certificate</b>. Return a newly allocated tor_x509_cert_t on + * success and NULL on failure. */ tor_x509_cert_t * tor_x509_cert_decode(const uint8_t *certificate, size_t certificate_len) { diff --git a/src/common/tortls.h b/src/common/tortls.h index 22b1a9e..28a73e9 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -132,7 +132,8 @@ int tor_tls_get_my_certs(int server, const tor_x509_cert_t **id_cert_out); crypto_pk_t *tor_tls_get_my_client_auth_key(void); crypto_pk_t *tor_tls_cert_get_key(tor_x509_cert_t *cert); -int tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_x509_cert_t *cert); +int tor_tls_cert_matches_key(const tor_tls_t *tls, + const tor_x509_cert_t *cert); int tor_tls_cert_is_valid(int severity, const tor_x509_cert_t *cert, const tor_x509_cert_t *signing_cert, diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6c584a5..4ab47f0 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2348,7 +2348,8 @@ connection_or_compute_authenticate_cell_body(or_connection_t *conn, if (tor_tls_get_my_certs(server, &link_cert, &id_cert)) return -1; my_digests = tor_x509_cert_get_id_digests(id_cert); - their_digests = tor_x509_cert_get_id_digests(conn->handshake_state->id_cert); + their_digests = + tor_x509_cert_get_id_digests(conn->handshake_state->id_cert); tor_assert(my_digests); tor_assert(their_digests); my_id = (uint8_t*)my_digests->d[DIGEST_SHA256];