From: Marco Bettini Date: Tue, 15 Mar 2022 09:45:23 +0000 (+0000) Subject: lib-ssl-iostream: protocol_versions[] - Reformat table X-Git-Tag: 2.4.0~4250 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b49f816e96f7ea014bfc572bffc10edd84334376;p=thirdparty%2Fdovecot%2Fcore.git lib-ssl-iostream: protocol_versions[] - Reformat table --- diff --git a/src/lib-ssl-iostream/iostream-openssl-common.c b/src/lib-ssl-iostream/iostream-openssl-common.c index c0dee95c4e..1d0a484635 100644 --- a/src/lib-ssl-iostream/iostream-openssl-common.c +++ b/src/lib-ssl-iostream/iostream-openssl-common.c @@ -28,21 +28,20 @@ static const struct { int version; long opt; } protocol_versions[] = { - { SSL_TXT_ANY, TLS_ANY_VERSION, SSL_OP_NO_SSLv3 }, - { SSL_TXT_TLSV1, TLS1_VERSION, SSL_OP_NO_SSLv3 }, - { SSL_TXT_TLSV1_1, TLS1_1_VERSION, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 }, - { SSL_TXT_TLSV1_2, TLS1_2_VERSION, - SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 }, + { SSL_TXT_ANY, TLS_ANY_VERSION, SSL_OP_NO_SSLv3 }, + { SSL_TXT_TLSV1, TLS1_VERSION, SSL_OP_NO_SSLv3 }, + { SSL_TXT_TLSV1_1, TLS1_1_VERSION, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 }, + { SSL_TXT_TLSV1_2, TLS1_2_VERSION, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | + SSL_OP_NO_TLSv1_1 }, #if defined(TLS1_3_VERSION) - { "TLSv1.3", TLS1_3_VERSION, - SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | - SSL_OP_NO_TLSv1_2 }, + { "TLSv1.3", TLS1_3_VERSION, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | + SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 }, #endif /* Use latest protocol version. If this is used on some ancient system which does not support ssl_min_protocol, ensure only TLSv1.2 is supported. */ - { "LATEST", TLS_MAX_VERSION, - SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 }, + { "LATEST", TLS_MAX_VERSION, SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | + SSL_OP_NO_TLSv1_1 }, }; int openssl_min_protocol_to_options(const char *min_protocol, long *opt_r, int *version_r)