commit 9d355bf47983019ab6b3f20d0c8c5870961b016f Author: Nick Mathewson <nickm@torproject.org> Date: Sun Oct 23 13:30:33 2011 -0400 Double-check that we really can get RSA keys from ID/Auth certs Addresses issue 4287; issue not in any released Tor. --- src/or/command.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index 49c9880..c4cc3a9 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -989,6 +989,8 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) ERR("Couldn't compute digests for key in ID cert"); identity_rcvd = tor_tls_cert_get_key(id_cert); + if (!identity_rcvd) + ERR("Internal error: Couldn't get RSA key from ID cert."); memcpy(conn->handshake_state->authenticated_peer_id, id_digests->d[DIGEST_SHA1], DIGEST_LEN); connection_or_set_circid_type(conn, identity_rcvd); @@ -1183,6 +1185,8 @@ command_process_authenticate_cell(var_cell_t *cell, or_connection_t *conn) size_t keysize; int signed_len; + if (!pk) + ERR("Internal error: couldn't get RSA key from AUTH cert."); crypto_digest256(d, (char*)auth, V3_AUTH_BODY_LEN, DIGEST_SHA256); keysize = crypto_pk_keysize(pk);