diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:28:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:28:13 -0400 |
| commit | 9fea00928cb680f550a5ea9c64227efc025ea69b (patch) | |
| tree | 6209a42730f3108c91b350740251280ad585ddaa /src/common/tortls.h | |
| parent | 80aca1501ae080ddb9c8f457290226dd5453b08a (diff) | |
| parent | ec84fc1d8ecb56fde887eb01d3bca1a031bd1e89 (diff) | |
| download | tor-9fea00928cb680f550a5ea9c64227efc025ea69b.tar.gz tor-9fea00928cb680f550a5ea9c64227efc025ea69b.zip | |
Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9
Diffstat (limited to 'src/common/tortls.h')
| -rw-r--r-- | src/common/tortls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h index 7c035a2cd5..f018c45c82 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -197,7 +197,9 @@ void tor_tls_set_renegotiate_callback(tor_tls_t *tls, int tor_tls_is_server(tor_tls_t *tls); void tor_tls_free(tor_tls_t *tls); int tor_tls_peer_has_cert(tor_tls_t *tls); +tor_x509_cert_t *tor_x509_cert_dup(const tor_x509_cert_t *cert); MOCK_DECL(tor_x509_cert_t *,tor_tls_get_peer_cert,(tor_tls_t *tls)); +MOCK_DECL(tor_x509_cert_t *,tor_tls_get_own_cert,(tor_tls_t *tls)); int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_t **identity); int tor_tls_check_lifetime(int severity, tor_tls_t *tls, int past_tolerance, |