Mon, 18 Aug 2008 01:00:58 +0000
Close notify and request dialogs with PurpleSslConnection as handle.
This fixes crashes with the Accept/Reject Certificate dialog after an
account is disabled. It only works because the NSS and GnuTLS plugins
pass the sslconn as their callback data, and the certificate code uses
that data as the handle. Not sure, but I still think this will leak
PurpleCertificateVerificationRequest's though because there doesn't
seem to be anyone hanging on to them.
| 6703 | 1 | /** |
| 2 | * @file sslconn.c SSL API | |
| 3 | * @ingroup core | |
|
20147
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
4 | */ |
|
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
5 | |
|
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
6 | /* purple |
| 6703 | 7 | * |
| 15884 | 8 | * Purple is the legal property of its developers, whose names are too numerous |
| 8046 | 9 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 10 | * source distribution. | |
| 6703 | 11 | * |
| 12 | * This program is free software; you can redistribute it and/or modify | |
| 13 | * it under the terms of the GNU General Public License as published by | |
| 14 | * the Free Software Foundation; either version 2 of the License, or | |
| 15 | * (at your option) any later version. | |
| 16 | * | |
| 17 | * This program is distributed in the hope that it will be useful, | |
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 20 | * GNU General Public License for more details. | |
| 21 | * | |
| 22 | * You should have received a copy of the GNU General Public License | |
| 23 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19670
diff
changeset
|
24 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 6703 | 25 | */ |
| 26 | #include "internal.h" | |
| 27 | ||
|
18476
419bd8747936
- sslconn.c will need the certificate API
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18451
diff
changeset
|
28 | #include "certificate.h" |
| 6703 | 29 | #include "debug.h" |
|
24116
56d1536da928
Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
20147
diff
changeset
|
30 | #include "request.h" |
| 6703 | 31 | #include "sslconn.h" |
| 32 | ||
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
33 | static gboolean _ssl_initialized = FALSE; |
| 15884 | 34 | static PurpleSslOps *_ssl_ops = NULL; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
35 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
36 | static gboolean |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
37 | ssl_init(void) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
38 | { |
| 15884 | 39 | PurplePlugin *plugin; |
| 40 | PurpleSslOps *ops; | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
41 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
42 | if (_ssl_initialized) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
43 | return FALSE; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
44 | |
| 15884 | 45 | plugin = purple_plugins_find_with_id("core-ssl"); |
|
7018
c441ecf99639
[gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
46 | |
| 15884 | 47 | if (plugin != NULL && !purple_plugin_is_loaded(plugin)) |
| 48 | purple_plugin_load(plugin); | |
|
7018
c441ecf99639
[gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
49 | |
| 15884 | 50 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
51 | if ((ops == NULL) || (ops->init == NULL) || (ops->uninit == NULL) || |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
52 | (ops->connectfunc == NULL) || (ops->close == NULL) || |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
53 | (ops->read == NULL) || (ops->write == NULL)) |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
54 | { |
|
7863
98ef7c137ea5
[gaim-migrate @ 8517]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7355
diff
changeset
|
55 | return FALSE; |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
56 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
57 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
58 | return ops->init(); |
| 6703 | 59 | } |
| 60 | ||
| 61 | gboolean | |
| 15884 | 62 | purple_ssl_is_supported(void) |
| 6703 | 63 | { |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
64 | #ifdef HAVE_SSL |
| 7355 | 65 | ssl_init(); |
| 15884 | 66 | return (purple_ssl_get_ops() != NULL); |
| 6703 | 67 | #else |
| 68 | return FALSE; | |
| 69 | #endif | |
| 70 | } | |
| 71 | ||
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
72 | static void |
| 15884 | 73 | purple_ssl_connect_cb(gpointer data, gint source, const gchar *error_message) |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
74 | { |
| 15884 | 75 | PurpleSslConnection *gsc; |
| 76 | PurpleSslOps *ops; | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
77 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
78 | gsc = data; |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
79 | gsc->connect_data = NULL; |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
80 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
81 | if (source < 0) |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
82 | { |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
83 | if (gsc->error_cb != NULL) |
| 15884 | 84 | gsc->error_cb(gsc, PURPLE_SSL_CONNECT_FAILED, gsc->connect_cb_data); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
85 | |
| 15884 | 86 | purple_ssl_close(gsc); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
87 | return; |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
88 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
89 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
90 | gsc->fd = source; |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
91 | |
| 15884 | 92 | ops = purple_ssl_get_ops(); |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
93 | ops->connectfunc(gsc); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
94 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
95 | |
| 15884 | 96 | PurpleSslConnection * |
| 97 | purple_ssl_connect(PurpleAccount *account, const char *host, int port, | |
| 98 | PurpleSslInputFunction func, PurpleSslErrorFunction error_func, | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
99 | void *data) |
| 6703 | 100 | { |
| 15884 | 101 | PurpleSslConnection *gsc; |
| 6703 | 102 | |
| 103 | g_return_val_if_fail(host != NULL, NULL); | |
| 104 | g_return_val_if_fail(port != 0 && port != -1, NULL); | |
| 105 | g_return_val_if_fail(func != NULL, NULL); | |
| 15884 | 106 | g_return_val_if_fail(purple_ssl_is_supported(), NULL); |
| 6703 | 107 | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
108 | if (!_ssl_initialized) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
109 | { |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
110 | if (!ssl_init()) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
111 | return NULL; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
112 | } |
| 6703 | 113 | |
| 15884 | 114 | gsc = g_new0(PurpleSslConnection, 1); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
115 | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
116 | gsc->fd = -1; |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
117 | gsc->host = g_strdup(host); |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
118 | gsc->port = port; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
119 | gsc->connect_cb_data = data; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
120 | gsc->connect_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
121 | gsc->error_cb = error_func; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
122 | |
|
18587
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
123 | /* TODO: Move this elsewhere */ |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
124 | gsc->verifier = purple_certificate_find_verifier("x509","tls_cached"); |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
125 | |
| 15884 | 126 | gsc->connect_data = purple_proxy_connect(NULL, account, host, port, purple_ssl_connect_cb, gsc); |
| 6703 | 127 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
128 | if (gsc->connect_data == NULL) |
| 6703 | 129 | { |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
130 | g_free(gsc->host); |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
131 | g_free(gsc); |
| 6703 | 132 | |
| 133 | return NULL; | |
| 134 | } | |
| 135 | ||
| 15884 | 136 | return (PurpleSslConnection *)gsc; |
| 6703 | 137 | } |
| 138 | ||
| 6764 | 139 | static void |
| 15884 | 140 | recv_cb(gpointer data, gint source, PurpleInputCondition cond) |
| 6764 | 141 | { |
| 15884 | 142 | PurpleSslConnection *gsc = data; |
| 6764 | 143 | |
| 144 | gsc->recv_cb(gsc->recv_cb_data, gsc, cond); | |
| 145 | } | |
| 146 | ||
| 147 | void | |
| 15884 | 148 | purple_ssl_input_add(PurpleSslConnection *gsc, PurpleSslInputFunction func, |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
149 | void *data) |
| 6764 | 150 | { |
| 151 | g_return_if_fail(func != NULL); | |
| 15884 | 152 | g_return_if_fail(purple_ssl_is_supported()); |
| 6764 | 153 | |
| 154 | gsc->recv_cb_data = data; | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
155 | gsc->recv_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
156 | |
| 15884 | 157 | gsc->inpa = purple_input_add(gsc->fd, PURPLE_INPUT_READ, recv_cb, gsc); |
| 6764 | 158 | } |
| 159 | ||
|
18487
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
160 | const gchar * |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
161 | purple_ssl_strerror(PurpleSslErrorType error) |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
162 | { |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
163 | switch(error) { |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
164 | case PURPLE_SSL_CONNECT_FAILED: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
165 | return _("SSL Connection Failed"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
166 | case PURPLE_SSL_HANDSHAKE_FAILED: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
167 | return _("SSL Handshake Failed"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
168 | case PURPLE_SSL_CERTIFICATE_INVALID: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
169 | return _("SSL peer presented an invalid certificate"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
170 | default: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
171 | purple_debug_warning("sslconn", "Unknown SSL error code %d\n", error); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
172 | return _("Unknown SSL error"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
173 | } |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
174 | } |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
175 | |
| 15884 | 176 | PurpleSslConnection * |
| 177 | purple_ssl_connect_fd(PurpleAccount *account, int fd, | |
| 178 | PurpleSslInputFunction func, | |
|
17765
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
179 | PurpleSslErrorFunction error_func, |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
180 | void *data) |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
181 | { |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
182 | return purple_ssl_connect_with_host_fd(account, fd, func, error_func, NULL, data); |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
183 | } |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
184 | |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
185 | PurpleSslConnection * |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
186 | purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
187 | PurpleSslInputFunction func, |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
188 | PurpleSslErrorFunction error_func, |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
189 | const char *host, |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
190 | void *data) |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
191 | { |
| 15884 | 192 | PurpleSslConnection *gsc; |
| 193 | PurpleSslOps *ops; | |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
194 | |
|
14048
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13664
diff
changeset
|
195 | g_return_val_if_fail(fd != -1, NULL); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
196 | g_return_val_if_fail(func != NULL, NULL); |
| 15884 | 197 | g_return_val_if_fail(purple_ssl_is_supported(), NULL); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
198 | |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
199 | if (!_ssl_initialized) |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
200 | { |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
201 | if (!ssl_init()) |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
202 | return NULL; |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
203 | } |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
204 | |
| 15884 | 205 | gsc = g_new0(PurpleSslConnection, 1); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
206 | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
207 | gsc->connect_cb_data = data; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
208 | gsc->connect_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
209 | gsc->error_cb = error_func; |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
210 | gsc->fd = fd; |
|
17765
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
211 | if(host) |
|
04aaa6965b10
Fixed one of the issues in the ssl stuff, allowing CN cert checks for starttls-connections in XMPP.
Andreas Monitzer <am@adiumx.com>
parents:
17316
diff
changeset
|
212 | gsc->host = g_strdup(host); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
213 | |
|
18587
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
214 | /* TODO: Move this elsewhere */ |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
215 | gsc->verifier = purple_certificate_find_verifier("x509","tls_cached"); |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
216 | |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
217 | |
| 15884 | 218 | ops = purple_ssl_get_ops(); |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
219 | ops->connectfunc(gsc); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
220 | |
| 15884 | 221 | return (PurpleSslConnection *)gsc; |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
222 | } |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
223 | |
| 6703 | 224 | void |
| 15884 | 225 | purple_ssl_close(PurpleSslConnection *gsc) |
| 6703 | 226 | { |
| 15884 | 227 | PurpleSslOps *ops; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
228 | |
| 6703 | 229 | g_return_if_fail(gsc != NULL); |
| 230 | ||
|
24116
56d1536da928
Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
20147
diff
changeset
|
231 | purple_request_close_with_handle(gsc); |
|
56d1536da928
Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
20147
diff
changeset
|
232 | purple_notify_close_with_handle(gsc); |
|
56d1536da928
Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
20147
diff
changeset
|
233 | |
| 15884 | 234 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
235 | (ops->close)(gsc); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
236 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
237 | if (gsc->connect_data != NULL) |
| 15884 | 238 | purple_proxy_connect_cancel(gsc->connect_data); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
239 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
240 | if (gsc->inpa > 0) |
| 15884 | 241 | purple_input_remove(gsc->inpa); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
242 | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
243 | if (gsc->fd >= 0) |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
244 | close(gsc->fd); |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
245 | |
|
14048
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13664
diff
changeset
|
246 | g_free(gsc->host); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
247 | g_free(gsc); |
| 6703 | 248 | } |
| 249 | ||
| 250 | size_t | |
| 15884 | 251 | purple_ssl_read(PurpleSslConnection *gsc, void *data, size_t len) |
| 6703 | 252 | { |
| 15884 | 253 | PurpleSslOps *ops; |
| 6703 | 254 | |
| 255 | g_return_val_if_fail(gsc != NULL, 0); | |
| 256 | g_return_val_if_fail(data != NULL, 0); | |
| 257 | g_return_val_if_fail(len > 0, 0); | |
| 258 | ||
| 15884 | 259 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
260 | return (ops->read)(gsc, data, len); |
| 6703 | 261 | } |
| 262 | ||
| 263 | size_t | |
| 15884 | 264 | purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) |
| 6703 | 265 | { |
| 15884 | 266 | PurpleSslOps *ops; |
| 6703 | 267 | |
| 268 | g_return_val_if_fail(gsc != NULL, 0); | |
| 269 | g_return_val_if_fail(data != NULL, 0); | |
| 270 | g_return_val_if_fail(len > 0, 0); | |
| 271 | ||
| 15884 | 272 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
273 | return (ops->write)(gsc, data, len); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
274 | } |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
275 | |
|
18451
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
276 | GList * |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
277 | purple_ssl_get_peer_certificates(PurpleSslConnection *gsc) |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
278 | { |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
279 | PurpleSslOps *ops; |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
280 | |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
281 | g_return_val_if_fail(gsc != NULL, NULL); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
282 | |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
283 | ops = purple_ssl_get_ops(); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
284 | return (ops->get_peer_certificates)(gsc); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
285 | } |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
286 | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
287 | void |
| 15884 | 288 | purple_ssl_set_ops(PurpleSslOps *ops) |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
289 | { |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
290 | _ssl_ops = ops; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
291 | } |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
292 | |
| 15884 | 293 | PurpleSslOps * |
| 294 | purple_ssl_get_ops(void) | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
295 | { |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
296 | return _ssl_ops; |
| 6703 | 297 | } |
| 298 | ||
| 299 | void | |
| 15884 | 300 | purple_ssl_init(void) |
| 6703 | 301 | { |
|
19357
70ea09942a62
- Force full initialization of SSL system at startup
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18587
diff
changeset
|
302 | /* Although purple_ssl_is_supported will do the initialization on |
|
70ea09942a62
- Force full initialization of SSL system at startup
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18587
diff
changeset
|
303 | command, SSL plugins tend to register CertificateSchemes as well |
|
70ea09942a62
- Force full initialization of SSL system at startup
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18587
diff
changeset
|
304 | as providing SSL ops. */ |
|
19668
2071903c58e4
Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <datallah@pidgin.im>
parents:
19357
diff
changeset
|
305 | if (!ssl_init()) { |
|
2071903c58e4
Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <datallah@pidgin.im>
parents:
19357
diff
changeset
|
306 | purple_debug_error("sslconn", "Unable to initialize SSL.\n"); |
|
2071903c58e4
Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <datallah@pidgin.im>
parents:
19357
diff
changeset
|
307 | } |
| 6703 | 308 | } |
| 309 | ||
| 310 | void | |
| 15884 | 311 | purple_ssl_uninit(void) |
| 6703 | 312 | { |
| 15884 | 313 | PurpleSslOps *ops; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
314 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
315 | if (!_ssl_initialized) |
| 6703 | 316 | return; |
| 317 | ||
| 15884 | 318 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
319 | ops->uninit(); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
320 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
321 | _ssl_initialized = FALSE; |
| 6703 | 322 | } |