mutt/mutt-1.9.0-ssl_ciphers.patch

33 lines
1.1 KiB
Diff
Raw Normal View History

2017-09-04 14:55:07 +00:00
diff -ur mutt-1.9.0.orig/init.h mutt-1.9.0/init.h
--- mutt-1.9.0.orig/init.h 2017-09-04 16:48:21.409528002 +0200
+++ mutt-1.9.0/init.h 2017-09-04 16:49:26.505093636 +0200
@@ -3510,7 +3510,7 @@
*/
# endif /* defined HAVE_SSL_PARTIAL_CHAIN */
# endif /* defined USE_SSL_OPENSSL */
2019-12-02 11:31:14 +00:00
- { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p=0} },
+ { "ssl_ciphers", DT_STR, R_NONE, {.p=&SslCiphers}, {.p="@SYSTEM"} },
2017-09-04 14:55:07 +00:00
/*
** .pp
** Contains a colon-separated list of ciphers to use when using SSL.
2017-09-04 14:55:07 +00:00
diff -ur mutt-1.9.0.orig/mutt_ssl_gnutls.c mutt-1.9.0/mutt_ssl_gnutls.c
--- mutt-1.9.0.orig/mutt_ssl_gnutls.c 2017-09-04 16:48:21.403528134 +0200
+++ mutt-1.9.0/mutt_ssl_gnutls.c 2017-09-04 16:51:16.081679141 +0200
@@ -286,6 +286,8 @@
else
2019-12-02 11:31:14 +00:00
mutt_buffer_strcpy (priority, "NORMAL");
2017-09-04 14:55:07 +00:00
+if (SslCiphers && strcmp(SslCiphers, "@SYSTEM"))
+{
if (!option (OPTTLSV1_3))
2017-09-04 14:55:07 +00:00
{
nproto--;
@@ -313,6 +315,7 @@
2019-12-02 11:31:14 +00:00
mutt_error (_("All available protocols for TLS/SSL connection disabled"));
goto cleanup;
2017-09-04 14:55:07 +00:00
}
+}
2019-12-02 11:31:14 +00:00
if ((err = gnutls_priority_set_direct (data->state, mutt_b2s (priority), NULL)) < 0)
2017-09-04 14:55:07 +00:00
{