Remove tor_x509_get_cert_impl as unneeded.

This commit is contained in:
Nick Mathewson 2018-08-23 13:05:38 -04:00
parent b5fddbd241
commit 02086a216f
3 changed files with 1 additions and 11 deletions

View File

@ -480,7 +480,7 @@ tor_tls_cert_matches_key,(const tor_tls_t *tls, const tor_x509_cert_t *cert))
if (!peercert) if (!peercert)
return 0; return 0;
link_key = X509_get_pubkey(peercert); link_key = X509_get_pubkey(peercert);
cert_key = X509_get_pubkey((X509 *)tor_x509_cert_get_impl(cert)); cert_key = X509_get_pubkey(cert->cert);
result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1; result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1;

View File

@ -52,14 +52,6 @@ tor_tls_pick_certificate_lifetime(time_t now,
*end_time_out = end_time; *end_time_out = end_time;
} }
/** Return the underlying implementation for <b>cert</b> */
const tor_x509_cert_impl_t *
tor_x509_cert_get_impl(const tor_x509_cert_t *cert)
{
tor_assert(cert);
return cert->cert;
}
/** Return a set of digests for the public key in <b>cert</b>, or NULL if this /** Return a set of digests for the public key in <b>cert</b>, or NULL if this
* cert's public key is not one we know how to take the digest of. */ * cert's public key is not one we know how to take the digest of. */
const common_digests_t * const common_digests_t *

View File

@ -33,8 +33,6 @@ MOCK_DECL(tor_x509_cert_impl_t *, tor_tls_create_certificate,
unsigned int cert_lifetime)); unsigned int cert_lifetime));
MOCK_DECL(tor_x509_cert_t *, tor_x509_cert_new, MOCK_DECL(tor_x509_cert_t *, tor_x509_cert_new,
(tor_x509_cert_impl_t *x509_cert)); (tor_x509_cert_impl_t *x509_cert));
const tor_x509_cert_impl_t *tor_x509_cert_get_impl(
const tor_x509_cert_t *cert);
int tor_x509_check_cert_lifetime_internal(int severity, int tor_x509_check_cert_lifetime_internal(int severity,
const tor_x509_cert_impl_t *cert, const tor_x509_cert_impl_t *cert,