diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/channeltls.c | 10 | ||||
| -rw-r--r-- | src/or/torcert.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f5b81f03df..a3e1f8c867 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1955,9 +1955,7 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) identity_rcvd = tor_tls_cert_get_key(id_cert); if (!identity_rcvd) { - //LCOV_EXCL_START - ERR("Internal error: Couldn't get RSA key from ID cert."); - //LCOV_EXCL_STOP + ERR("Couldn't get RSA key from ID cert."); } memcpy(chan->conn->handshake_state->authenticated_rsa_peer_id, id_digests->d[DIGEST_SHA1], DIGEST_LEN); @@ -2242,10 +2240,8 @@ channel_tls_process_authenticate_cell(var_cell_t *cell, channel_tls_t *chan) size_t keysize; int signed_len; - if (BUG(!pk)) { - // LCOV_EXCL_START - ERR("Internal error: couldn't get RSA key from AUTH cert."); - // LCOV_EXCL_STOP + if (! pk) { + ERR("Couldn't get RSA key from AUTH cert."); } crypto_digest256(d, (char*)auth, V3_AUTH_BODY_LEN, DIGEST_SHA256); diff --git a/src/or/torcert.c b/src/or/torcert.c index d100298977..69f50aa970 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -559,6 +559,9 @@ or_handshake_certs_ed25519_ok(int severity, ERR("Missing RSA->Ed25519 crosscert"); } crypto_pk_t *rsa_id_key = tor_tls_cert_get_key(rsa_id_cert); + if (!rsa_id_key) { + ERR("RSA ID cert had no RSA key"); + } if (rsa_ed25519_crosscert_check(certs->ed_rsa_crosscert, certs->ed_rsa_crosscert_len, |