From f7e47fd526363bbe45dcc3e01ab1041c939b1713 Mon Sep 17 00:00:00 2001 From: Eric Faurot Date: Sat, 10 Apr 2021 10:19:20 +0000 Subject: remove dead code and unused dependencies ok tb@ --- usr.sbin/smtpd/smtpc.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'usr.sbin/smtpd/smtpc.c') diff --git a/usr.sbin/smtpd/smtpc.c b/usr.sbin/smtpd/smtpc.c index fd0f8ef3652..ca48604feb5 100644 --- a/usr.sbin/smtpd/smtpc.c +++ b/usr.sbin/smtpd/smtpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpc.c,v 1.14 2021/03/05 12:37:32 eric Exp $ */ +/* $OpenBSD: smtpc.c,v 1.15 2021/04/10 10:19:19 eric Exp $ */ /* * Copyright (c) 2018 Eric Faurot @@ -32,10 +32,7 @@ #include #include -#include - #include "smtp.h" -#include "ssl.h" #include "log.h" static void parse_server(char *); @@ -370,37 +367,6 @@ log_trace(int lvl, const char *emsg, ...) } } -void -smtp_verify_server_cert(void *tag, struct smtp_client *proto, void *ctx) -{ - SSL *ssl = ctx; - X509 *cert; - long res; - int match; - - if ((cert = SSL_get_peer_certificate(ssl))) { - (void)ssl_check_name(cert, servname, &match); - X509_free(cert); - res = SSL_get_verify_result(ssl); - if (res == X509_V_OK) { - if (match) { - log_debug("valid certificate"); - smtp_cert_verified(proto, CERT_OK); - } - else { - log_debug("certificate does not match hostname"); - smtp_cert_verified(proto, CERT_INVALID); - } - return; - } - log_debug("certificate validation error %ld", res); - } - else - log_debug("no certificate provided"); - - smtp_cert_verified(proto, CERT_INVALID); -} - void smtp_require_tls(void *tag, struct smtp_client *proto) { -- cgit v1.2.3