forked from openbsd/ports
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove dead code and unused dependencies
ok tb@
- Loading branch information
1 parent
d587572
commit 5d56712
Showing
2 changed files
with
4 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <[email protected]> | ||
|
@@ -32,10 +32,7 @@ | |
#include <tls.h> | ||
#include <unistd.h> | ||
|
||
#include <openssl/ssl.h> | ||
|
||
#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) | ||
{ | ||
|