From 59c1b34b72ec6c55ca4de0c56a9be3da3d1c3e08 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Sep 2018 12:09:43 -0400
Subject: Remove tor_tls_check_lifetime as unused.

Everything that might have used it, uses tor_tls_cert_is_valid() instead.
---
 src/lib/tls/tortls.c | 32 --------------------------------
 src/lib/tls/tortls.h |  4 ----
 2 files changed, 36 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c
index edf421b4db..64c26f7e14 100644
--- a/src/lib/tls/tortls.c
+++ b/src/lib/tls/tortls.c
@@ -433,35 +433,3 @@ tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_t **identity)
 
   return rv;
 }
-
-/** Check whether the certificate set on the connection <b>tls</b> is expired
- * give or take <b>past_tolerance</b> seconds, or not-yet-valid give or take
- * <b>future_tolerance</b> seconds. Return 0 for valid, -1 for failure.
- *
- * NOTE: you should call tor_tls_verify before tor_tls_check_lifetime.
- */
-int
-tor_tls_check_lifetime(int severity, tor_tls_t *tls,
-                       time_t now,
-                       int past_tolerance, int future_tolerance)
-{
-  tor_x509_cert_t *cert;
-  int r = -1;
-
-  if (!(cert = tor_tls_get_peer_cert(tls)))
-    goto done;
-
-  if (tor_x509_check_cert_lifetime_internal(severity, cert->cert, now,
-                                            past_tolerance,
-                                            future_tolerance) < 0)
-    goto done;
-
-  r = 0;
- done:
-  tor_x509_cert_free(cert);
-#ifdef ENABLE_OPENSSL
-  tls_log_errors(tls, LOG_WARN, LD_NET, "checking certificate lifetime");
-#endif
-
-  return r;
-}
diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h
index a8bc7370a7..4591927081 100644
--- a/src/lib/tls/tortls.h
+++ b/src/lib/tls/tortls.h
@@ -100,10 +100,6 @@ int tor_tls_peer_has_cert(tor_tls_t *tls);
 MOCK_DECL(struct tor_x509_cert_t *,tor_tls_get_peer_cert,(tor_tls_t *tls));
 MOCK_DECL(struct 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, time_t now,
-                           int past_tolerance,
-                           int future_tolerance);
 MOCK_DECL(int, tor_tls_read, (tor_tls_t *tls, char *cp, size_t len));
 int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n);
 int tor_tls_handshake(tor_tls_t *tls);
-- 
cgit v1.2.3-54-g00ecf