[tor-commits] [tor/master] Function to return peer cert as tor_tls_cert

nickm at torproject.org nickm at torproject.org
Tue Oct 11 03:22:16 UTC 2011


commit e48e47fa03fa09d89527c1bbfaee4c9d7d3eee6e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 22 11:01:14 2011 -0400

    Function to return peer cert as tor_tls_cert
---
 src/common/tortls.c |   12 ++++++++++++
 src/common/tortls.h |    1 +
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index e275307..aa90f18 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1856,6 +1856,18 @@ tor_tls_peer_has_cert(tor_tls_t *tls)
   return 1;
 }
 
+/** Return the peer certificate, or NULL if there isn't one. */
+tor_cert_t *
+tor_tls_get_peer_cert(tor_tls_t *tls)
+{
+  X509 *cert;
+  cert = SSL_get_peer_certificate(tls->ssl);
+  tls_log_errors(tls, LOG_WARN, LD_HANDSHAKE, "getting peer certificate");
+  if (!cert)
+    return NULL;
+  return tor_cert_new(cert);
+}
+
 /** Warn that a certificate lifetime extends through a certain range. */
 static void
 log_cert_lifetime(const X509 *cert, const char *problem)
diff --git a/src/common/tortls.h b/src/common/tortls.h
index b522dd1..00bf406 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -66,6 +66,7 @@ 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_cert_t *tor_tls_get_peer_cert(tor_tls_t *tls);
 int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity);
 int tor_tls_check_lifetime(tor_tls_t *tls, int tolerance);
 int tor_tls_read(tor_tls_t *tls, char *cp, size_t len);





More information about the tor-commits mailing list