From 7ec4ffbdbc562c4a2909d9bf4f3093072e0e3ac1 Mon Sep 17 00:00:00 2001 From: Manuel Mausz Date: Wed, 27 Jun 2018 01:06:16 +0200 Subject: OpenSSL 1.1 compatibility This adds compatibility for OpenSSL 1.1 Since renegotiation is removed from TLS 1.3 we also removed support for authentication via client certificates (control/tlsclients). In general this is still supported by TLS 1.3 however I'm just lazy and we don't need this feature anyway. This also adds optional support for OpenSSL configuration commands for qmail-smtpd and qmail-remote. Commands are loaded from control/opensslconf. For a list of supported commands see https://www.openssl.org/docs/man1.0.2/ssl/SSL_CONF_cmd.html#SUPPORTED-CONFIGURATION-FILE-COMMANDS --- ssl_timeoutio.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'ssl_timeoutio.c') diff --git a/ssl_timeoutio.c b/ssl_timeoutio.c index 5b2dc9d..30025d5 100644 --- a/ssl_timeoutio.c +++ b/ssl_timeoutio.c @@ -68,19 +68,6 @@ int ssl_timeoutconn(int t, int rfd, int wfd, SSL *ssl) return r; } -int ssl_timeoutrehandshake(int t, int rfd, int wfd, SSL *ssl) -{ - int r; - - SSL_renegotiate(ssl); - r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); - if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r; - - /* this is for the server only */ - ssl->state = SSL_ST_ACCEPT; - return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); -} - int ssl_timeoutread(int t, int rfd, int wfd, SSL *ssl, char *buf, int len) { if (!buf) return 0; -- cgit v1.2.3