1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
commit f94101b0a9d1a321efe1d3079be2c9d4646fbd29
Author: Kevin McCarthy <kevin@8t8.us>
Date: Fri Aug 22 18:51:38 2014 -0700
Fix deprecated gnutls_protocol_set_priority. (closes #3515)
This patch is based off of the patch at
http://dev.mutt.org/trac/attachment/ticket/3515/624058-gnutls-deprecated-set-priority.patch
The mutt source has changed since then, with more TLS options being
added. This patch therefore uses a slightly different strategy for generating the
priority string.
The patch also adds autoconf support, as requested by brendan at
http://dev.mutt.org/trac/ticket/3515#comment:1
diff --git a/configure.ac b/configure.ac
index 20c59e0..8df1689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -707,6 +707,9 @@ then
AC_CHECK_DECLS([GNUTLS_VERIFY_DISABLE_TIME_CHECKS], [], [],
[[#include <gnutls/x509.h>]])
+ LIBS="$LIBS -lgnutls"
+ AC_CHECK_FUNCS(gnutls_priority_set_direct)
+
LIBS="$saved_LIBS"
MUTTLIBS="$MUTTLIBS -lgnutls"
diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 551dde7..3ff879b 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -238,19 +238,93 @@ err_crt:
gnutls_x509_crt_deinit (clientcrt);
}
+#if HAVE_GNUTLS_PRIORITY_SET_DIRECT
+static int tls_set_priority(tlssockdata *data)
+{
+ size_t nproto = 4;
+ char priority[SHORT_STRING];
+ int err;
+
+ priority[0] = 0;
+ safe_strcat (priority, sizeof (priority), "NORMAL");
+
+ if (! option(OPTTLSV1_2))
+ {
+ nproto--;
+ safe_strcat (priority, sizeof (priority), ":-VERS-TLS1.2");
+ }
+ if (! option(OPTTLSV1_1))
+ {
+ nproto--;
+ safe_strcat (priority, sizeof (priority), ":-VERS-TLS1.1");
+ }
+ if (! option(OPTTLSV1))
+ {
+ nproto--;
+ safe_strcat (priority, sizeof (priority), ":-VERS-TLS1.0");
+ }
+ if (! option(OPTSSLV3))
+ {
+ nproto--;
+ safe_strcat (priority, sizeof (priority), ":-VERS-SSL3.0");
+ }
+
+ if (nproto == 0)
+ {
+ mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+ return -1;
+ }
+
+ if ((err = gnutls_priority_set_direct (data->state, priority, NULL)) < 0)
+ {
+ mutt_error ("gnutls_priority_set_direct(%s): %s", priority, gnutls_strerror(err));
+ mutt_sleep (2);
+ return -1;
+ }
+
+ return 0;
+}
+#else
/* This array needs to be large enough to hold all the possible values support
* by Mutt. The initialized values are just placeholders--the array gets
* overwrriten in tls_negotiate() depending on the $ssl_use_* options.
*/
static int protocol_priority[] = {GNUTLS_TLS1_2, GNUTLS_TLS1_1, GNUTLS_TLS1, GNUTLS_SSL3, 0};
+static int tls_set_priority(tlssockdata *data)
+{
+ size_t nproto = 0; /* number of tls/ssl protocols */
+
+ if (option(OPTTLSV1_2))
+ protocol_priority[nproto++] = GNUTLS_TLS1_2;
+ if (option(OPTTLSV1_1))
+ protocol_priority[nproto++] = GNUTLS_TLS1_1;
+ if (option(OPTTLSV1))
+ protocol_priority[nproto++] = GNUTLS_TLS1;
+ if (option(OPTSSLV3))
+ protocol_priority[nproto++] = GNUTLS_SSL3;
+ protocol_priority[nproto] = 0;
+
+ if (nproto == 0)
+ {
+ mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+ return -1;
+ }
+
+ /* We use default priorities (see gnutls documentation),
+ except for protocol version */
+ gnutls_set_default_priority (data->state);
+ gnutls_protocol_set_priority (data->state, protocol_priority);
+ return 0;
+}
+#endif
+
/* tls_negotiate: After TLS state has been initialized, attempt to negotiate
* TLS over the wire, including certificate checks. */
static int tls_negotiate (CONNECTION * conn)
{
tlssockdata *data;
int err;
- size_t nproto = 0; /* number of tls/ssl protocols */
data = (tlssockdata *) safe_calloc (1, sizeof (tlssockdata));
conn->sockdata = data;
@@ -296,31 +370,9 @@ static int tls_negotiate (CONNECTION * conn)
/* set socket */
gnutls_transport_set_ptr (data->state, (gnutls_transport_ptr)conn->fd);
- if (option(OPTTLSV1_2))
- protocol_priority[nproto++] = GNUTLS_TLS1_2;
- if (option(OPTTLSV1_1))
- protocol_priority[nproto++] = GNUTLS_TLS1_1;
- if (option(OPTTLSV1))
- protocol_priority[nproto++] = GNUTLS_TLS1;
- if (option(OPTSSLV3))
- protocol_priority[nproto++] = GNUTLS_SSL3;
- protocol_priority[nproto] = 0;
-
- /* disable TLS/SSL protocols as needed */
- if (nproto == 0)
- {
- mutt_error (_("All available protocols for TLS/SSL connection disabled"));
+ if (tls_set_priority(data) < 0) {
goto fail;
}
- /*
- else
- use the list set above
- */
-
- /* We use default priorities (see gnutls documentation),
- except for protocol version */
- gnutls_set_default_priority (data->state);
- gnutls_protocol_set_priority (data->state, protocol_priority);
if (SslDHPrimeBits > 0)
{
|