diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-11 19:38:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-21 12:25:33 -0400 |
| commit | 598bc78bfa62e0879497c0ef03999d3700a5cd16 (patch) | |
| tree | db1fe950940aff8bf13f804f7b3cbdd21f902e25 /src/lib/tls/tortls.c | |
| parent | 9a4f05b05c12687e640d2aed9bb21229138bd1a5 (diff) | |
| download | tor-598bc78bfa62e0879497c0ef03999d3700a5cd16.tar.gz tor-598bc78bfa62e0879497c0ef03999d3700a5cd16.zip | |
Extract tortls structures into a new header; clean up a little
Diffstat (limited to 'src/lib/tls/tortls.c')
| -rw-r--r-- | src/lib/tls/tortls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c index 20e4320813..cb507057ed 100644 --- a/src/lib/tls/tortls.c +++ b/src/lib/tls/tortls.c @@ -28,6 +28,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/compat_openssl.h" #include "lib/tls/x509.h" /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in @@ -51,8 +52,8 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#define TORTLS_PRIVATE #include "lib/tls/tortls.h" +#include "lib/tls/tortls_st.h" #include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/container/smartlist.h" @@ -599,7 +600,7 @@ tor_tls_cert_matches_key,(const tor_tls_t *tls, const tor_x509_cert_t *cert)) if (!peercert) return 0; link_key = X509_get_pubkey(peercert); - cert_key = X509_get_pubkey(cert->cert); + cert_key = X509_get_pubkey((X509 *)tor_x509_cert_get_impl(cert)); result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1; |