Marcus Rueckert
f0df186eb7
OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=73
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
Index: dovecot-2.3.10.1/src/config/old-set-parser.c
|
|
===================================================================
|
|
--- dovecot-2.3.10.1.orig/src/config/old-set-parser.c
|
|
+++ dovecot-2.3.10.1/src/config/old-set-parser.c
|
|
@@ -172,6 +172,9 @@ static int ssl_protocols_to_min_protocol
|
|
{
|
|
static const char *protocol_versions[] = {
|
|
"SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2",
|
|
+#ifdef TLS1_3_VERSION
|
|
+ "TLSv1.3",
|
|
+#endif
|
|
};
|
|
/* Array where -1 = disable, 0 = not found, 1 = enable */
|
|
int protos[N_ELEMENTS(protocol_versions)];
|
|
Index: dovecot-2.3.10.1/src/lib-ssl-iostream/iostream-openssl-common.c
|
|
===================================================================
|
|
--- dovecot-2.3.10.1.orig/src/lib-ssl-iostream/iostream-openssl-common.c
|
|
+++ dovecot-2.3.10.1/src/lib-ssl-iostream/iostream-openssl-common.c
|
|
@@ -9,6 +9,16 @@
|
|
#include <openssl/err.h>
|
|
#include <arpa/inet.h>
|
|
|
|
+/*
|
|
+ * SSL_TXT_TLSV1_3 is not defined in the openssl headers up to 1.1.1g.
|
|
+ * Define it here as no other part of the code uses those defines.
|
|
+ *
|
|
+ * https://github.com/openssl/openssl/pull/6720
|
|
+ */
|
|
+#ifndef SSL_TXT_TLSV1_3
|
|
+#define SSL_TXT_TLSV1_3 "TLSv1.3"
|
|
+#endif
|
|
+
|
|
/* openssl_min_protocol_to_options() scans this array for name and returns
|
|
version and opt. opt is used with SSL_set_options() and version is used with
|
|
SSL_set_min_proto_version(). Using either method should enable the same
|
|
@@ -23,6 +33,10 @@ static const struct {
|
|
{ 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 },
|
|
+#ifdef TLS1_3_VERSION
|
|
+ { SSL_TXT_TLSV1_3, TLS1_3_VERSION,
|
|
+ SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 },
|
|
+#endif
|
|
};
|
|
int openssl_min_protocol_to_options(const char *min_protocol, long *opt_r,
|
|
int *version_r)
|