mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 12:23:37 +02:00
Kill support for DANE.
This patch removes support for DANE validation of TLS certificates. There wasn't enough support in the IRC community to push for this on the majority of bigger IRC networks. If you believe this should be reintroduced into irssi, then please come up with an implementation that does not rely on the libval library. It is causing a lot of troubles for our downstream maintainers.
This commit is contained in:
parent
f533baa191
commit
5a04430998
4 changed files with 8 additions and 63 deletions
|
|
@ -32,11 +32,6 @@
|
|||
#include <openssl/ssl.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#ifdef HAVE_DANE
|
||||
#include <validator/validator.h>
|
||||
#include <validator/val_dane.h>
|
||||
#endif
|
||||
|
||||
/* ssl i/o channel object */
|
||||
typedef struct
|
||||
{
|
||||
|
|
@ -207,40 +202,6 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, const char* hostname, i
|
|||
{
|
||||
long result;
|
||||
|
||||
#ifdef HAVE_DANE
|
||||
int dane_ret;
|
||||
struct val_daneparams daneparams;
|
||||
struct val_danestatus *danestatus = NULL;
|
||||
|
||||
// Check if a TLSA record is available.
|
||||
daneparams.port = port;
|
||||
daneparams.proto = DANE_PARAM_PROTO_TCP;
|
||||
|
||||
dane_ret = val_getdaneinfo(NULL, hostname, &daneparams, &danestatus);
|
||||
|
||||
if (dane_ret == VAL_DANE_NOERROR) {
|
||||
signal_emit("tlsa available", 1, server);
|
||||
}
|
||||
|
||||
if (danestatus != NULL) {
|
||||
int do_certificate_check = 1;
|
||||
|
||||
if (val_dane_check(NULL, ssl, danestatus, &do_certificate_check) != VAL_DANE_NOERROR) {
|
||||
g_warning("DANE: TLSA record for hostname %s port %d could not be verified", hostname, port);
|
||||
signal_emit("tlsa verification failed", 1, server);
|
||||
val_free_dane(danestatus);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
signal_emit("tlsa verification success", 1, server);
|
||||
val_free_dane(danestatus);
|
||||
|
||||
if (do_certificate_check == 0) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
result = SSL_get_verify_result(ssl);
|
||||
if (result != X509_V_OK) {
|
||||
g_warning("Could not verify TLS servers certificate: %s", X509_verify_cert_error_string(result));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue