Fri, 23 Dec 2011 08:21:58 +0000
A boring and large patch so I can merge heads.
| 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 | */ |
|
24569
5dbd0617a27d
Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
Richard Laager <rlaager@pidgin.im>
parents:
24116
diff
changeset
|
26 | #define _PURPLE_SSLCONN_C_ |
|
5dbd0617a27d
Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
Richard Laager <rlaager@pidgin.im>
parents:
24116
diff
changeset
|
27 | |
| 6703 | 28 | #include "internal.h" |
| 29 | ||
|
18476
419bd8747936
- sslconn.c will need the certificate API
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18451
diff
changeset
|
30 | #include "certificate.h" |
| 6703 | 31 | #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
|
32 | #include "request.h" |
| 6703 | 33 | #include "sslconn.h" |
| 34 | ||
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
35 | static gboolean _ssl_initialized = FALSE; |
| 15884 | 36 | static PurpleSslOps *_ssl_ops = NULL; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
37 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
38 | static gboolean |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
39 | ssl_init(void) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
40 | { |
| 15884 | 41 | PurplePlugin *plugin; |
| 42 | PurpleSslOps *ops; | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
43 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
44 | if (_ssl_initialized) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
45 | return FALSE; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
46 | |
| 15884 | 47 | plugin = purple_plugins_find_with_id("core-ssl"); |
|
7018
c441ecf99639
[gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
48 | |
| 15884 | 49 | if (plugin != NULL && !purple_plugin_is_loaded(plugin)) |
| 50 | purple_plugin_load(plugin); | |
|
7018
c441ecf99639
[gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
51 | |
| 15884 | 52 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
53 | if ((ops == NULL) || (ops->init == NULL) || (ops->uninit == NULL) || |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
54 | (ops->connectfunc == NULL) || (ops->close == NULL) || |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
55 | (ops->read == NULL) || (ops->write == NULL)) |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
56 | { |
|
7863
98ef7c137ea5
[gaim-migrate @ 8517]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7355
diff
changeset
|
57 | return FALSE; |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
58 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
59 | |
|
25216
0dc178eff164
A patch from fqueze to prevent re-initalization of the SSL stuff. Fixes #7764.
Daniel Atallah <datallah@pidgin.im>
parents:
24569
diff
changeset
|
60 | return (_ssl_initialized = ops->init()); |
| 6703 | 61 | } |
| 62 | ||
| 63 | gboolean | |
| 15884 | 64 | purple_ssl_is_supported(void) |
| 6703 | 65 | { |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
66 | #ifdef HAVE_SSL |
| 7355 | 67 | ssl_init(); |
| 15884 | 68 | return (purple_ssl_get_ops() != NULL); |
| 6703 | 69 | #else |
| 70 | return FALSE; | |
| 71 | #endif | |
| 72 | } | |
| 73 | ||
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
74 | static void |
| 15884 | 75 | 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
|
76 | { |
| 15884 | 77 | PurpleSslConnection *gsc; |
| 78 | PurpleSslOps *ops; | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
79 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
80 | gsc = data; |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
81 | gsc->connect_data = NULL; |
|
14222
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 (source < 0) |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
84 | { |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
85 | if (gsc->error_cb != NULL) |
| 15884 | 86 | 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
|
87 | |
| 15884 | 88 | purple_ssl_close(gsc); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
89 | return; |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
90 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
91 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
92 | gsc->fd = source; |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
93 | |
| 15884 | 94 | ops = purple_ssl_get_ops(); |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
95 | ops->connectfunc(gsc); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
96 | } |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
97 | |
| 15884 | 98 | PurpleSslConnection * |
| 99 | purple_ssl_connect(PurpleAccount *account, const char *host, int port, | |
| 100 | PurpleSslInputFunction func, PurpleSslErrorFunction error_func, | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
101 | void *data) |
| 6703 | 102 | { |
|
27813
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
103 | return purple_ssl_connect_with_ssl_cn(account, host, port, func, error_func, |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
104 | NULL, data); |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
105 | } |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
106 | |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
107 | PurpleSslConnection * |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
108 | purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host, int port, |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
109 | PurpleSslInputFunction func, PurpleSslErrorFunction error_func, |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
110 | const char *ssl_cn, void *data) |
|
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
111 | { |
| 15884 | 112 | PurpleSslConnection *gsc; |
| 6703 | 113 | |
| 114 | g_return_val_if_fail(host != NULL, NULL); | |
| 115 | g_return_val_if_fail(port != 0 && port != -1, NULL); | |
| 116 | g_return_val_if_fail(func != NULL, NULL); | |
| 15884 | 117 | g_return_val_if_fail(purple_ssl_is_supported(), NULL); |
| 6703 | 118 | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
119 | if (!_ssl_initialized) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
120 | { |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
121 | if (!ssl_init()) |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
122 | return NULL; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
123 | } |
| 6703 | 124 | |
| 15884 | 125 | gsc = g_new0(PurpleSslConnection, 1); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
126 | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
127 | gsc->fd = -1; |
|
27813
7989c9bb5000
Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents:
25888
diff
changeset
|
128 | gsc->host = ssl_cn ? g_strdup(ssl_cn) : g_strdup(host); |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
129 | gsc->port = port; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
130 | gsc->connect_cb_data = data; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
131 | gsc->connect_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
132 | gsc->error_cb = error_func; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
133 | |
|
18587
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
134 | /* TODO: Move this elsewhere */ |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
135 | gsc->verifier = purple_certificate_find_verifier("x509","tls_cached"); |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
136 | |
| 15884 | 137 | gsc->connect_data = purple_proxy_connect(NULL, account, host, port, purple_ssl_connect_cb, gsc); |
| 6703 | 138 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
139 | if (gsc->connect_data == NULL) |
| 6703 | 140 | { |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
141 | g_free(gsc->host); |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
142 | g_free(gsc); |
| 6703 | 143 | |
| 144 | return NULL; | |
| 145 | } | |
| 146 | ||
| 15884 | 147 | return (PurpleSslConnection *)gsc; |
| 6703 | 148 | } |
| 149 | ||
| 6764 | 150 | static void |
| 15884 | 151 | recv_cb(gpointer data, gint source, PurpleInputCondition cond) |
| 6764 | 152 | { |
| 15884 | 153 | PurpleSslConnection *gsc = data; |
| 6764 | 154 | |
| 155 | gsc->recv_cb(gsc->recv_cb_data, gsc, cond); | |
| 156 | } | |
| 157 | ||
| 158 | void | |
| 15884 | 159 | purple_ssl_input_add(PurpleSslConnection *gsc, PurpleSslInputFunction func, |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
160 | void *data) |
| 6764 | 161 | { |
| 162 | g_return_if_fail(func != NULL); | |
| 15884 | 163 | g_return_if_fail(purple_ssl_is_supported()); |
| 6764 | 164 | |
| 165 | gsc->recv_cb_data = data; | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
166 | gsc->recv_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
167 | |
| 15884 | 168 | gsc->inpa = purple_input_add(gsc->fd, PURPLE_INPUT_READ, recv_cb, gsc); |
| 6764 | 169 | } |
| 170 | ||
|
18487
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
171 | const gchar * |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
172 | purple_ssl_strerror(PurpleSslErrorType 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 | switch(error) { |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
175 | case PURPLE_SSL_CONNECT_FAILED: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
176 | return _("SSL Connection Failed"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
177 | case PURPLE_SSL_HANDSHAKE_FAILED: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
178 | return _("SSL Handshake Failed"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
179 | case PURPLE_SSL_CERTIFICATE_INVALID: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
180 | 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
|
181 | default: |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
182 | 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
|
183 | return _("Unknown SSL error"); |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
184 | } |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
185 | } |
|
0730e45141fd
- Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18478
diff
changeset
|
186 | |
| 15884 | 187 | PurpleSslConnection * |
|
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
|
188 | 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
|
189 | 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
|
190 | 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
|
191 | 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
|
192 | void *data) |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
193 | { |
| 15884 | 194 | PurpleSslConnection *gsc; |
| 195 | PurpleSslOps *ops; | |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
196 | |
|
14048
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13664
diff
changeset
|
197 | g_return_val_if_fail(fd != -1, NULL); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
198 | g_return_val_if_fail(func != NULL, NULL); |
| 15884 | 199 | g_return_val_if_fail(purple_ssl_is_supported(), NULL); |
|
6762
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_initialized) |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
202 | { |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
203 | if (!ssl_init()) |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
204 | return NULL; |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
205 | } |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
206 | |
| 15884 | 207 | gsc = g_new0(PurpleSslConnection, 1); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
208 | |
|
7274
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
209 | gsc->connect_cb_data = data; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
210 | gsc->connect_cb = func; |
|
42ec5f56e32a
[gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents:
7024
diff
changeset
|
211 | gsc->error_cb = error_func; |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
212 | 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
|
213 | 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
|
214 | gsc->host = g_strdup(host); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
215 | |
|
18587
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
216 | /* TODO: Move this elsewhere */ |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
217 | gsc->verifier = purple_certificate_find_verifier("x509","tls_cached"); |
|
f5ce93d75799
(this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18586
diff
changeset
|
218 | |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25216
diff
changeset
|
219 | |
| 15884 | 220 | ops = purple_ssl_get_ops(); |
|
14241
7b47f525742a
[gaim-migrate @ 16829]
Mark Doliner <markdoliner@pidgin.im>
parents:
14229
diff
changeset
|
221 | ops->connectfunc(gsc); |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
222 | |
| 15884 | 223 | return (PurpleSslConnection *)gsc; |
|
6762
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
224 | } |
|
2349053f14aa
[gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents:
6745
diff
changeset
|
225 | |
| 6703 | 226 | void |
| 15884 | 227 | purple_ssl_close(PurpleSslConnection *gsc) |
| 6703 | 228 | { |
| 15884 | 229 | PurpleSslOps *ops; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
230 | |
| 6703 | 231 | g_return_if_fail(gsc != NULL); |
| 232 | ||
|
24116
56d1536da928
Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
20147
diff
changeset
|
233 | 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
|
234 | 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
|
235 | |
| 15884 | 236 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
237 | (ops->close)(gsc); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
238 | |
|
14324
8cbedd82b6ac
[gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
239 | if (gsc->connect_data != NULL) |
| 15884 | 240 | purple_proxy_connect_cancel(gsc->connect_data); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
241 | |
|
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
242 | if (gsc->inpa > 0) |
| 15884 | 243 | purple_input_remove(gsc->inpa); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
244 | |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
245 | if (gsc->fd >= 0) |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
246 | close(gsc->fd); |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
247 | |
|
14048
b577c53406c0
[gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents:
13664
diff
changeset
|
248 | g_free(gsc->host); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
249 | g_free(gsc); |
| 6703 | 250 | } |
| 251 | ||
| 252 | size_t | |
| 15884 | 253 | purple_ssl_read(PurpleSslConnection *gsc, void *data, size_t len) |
| 6703 | 254 | { |
| 15884 | 255 | PurpleSslOps *ops; |
| 6703 | 256 | |
| 257 | g_return_val_if_fail(gsc != NULL, 0); | |
| 258 | g_return_val_if_fail(data != NULL, 0); | |
| 259 | g_return_val_if_fail(len > 0, 0); | |
| 260 | ||
| 15884 | 261 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
262 | return (ops->read)(gsc, data, len); |
| 6703 | 263 | } |
| 264 | ||
| 265 | size_t | |
| 15884 | 266 | purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) |
| 6703 | 267 | { |
| 15884 | 268 | PurpleSslOps *ops; |
| 6703 | 269 | |
| 270 | g_return_val_if_fail(gsc != NULL, 0); | |
| 271 | g_return_val_if_fail(data != NULL, 0); | |
| 272 | g_return_val_if_fail(len > 0, 0); | |
| 273 | ||
| 15884 | 274 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
275 | return (ops->write)(gsc, data, len); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
276 | } |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
277 | |
|
18451
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
278 | GList * |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
279 | purple_ssl_get_peer_certificates(PurpleSslConnection *gsc) |
|
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 | PurpleSslOps *ops; |
|
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 | g_return_val_if_fail(gsc != NULL, NULL); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
284 | |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
285 | ops = purple_ssl_get_ops(); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
286 | return (ops->get_peer_certificates)(gsc); |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
287 | } |
|
304d2fa12f6a
- purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17765
diff
changeset
|
288 | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
289 | void |
| 15884 | 290 | purple_ssl_set_ops(PurpleSslOps *ops) |
|
6738
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 | _ssl_ops = ops; |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
293 | } |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
294 | |
| 15884 | 295 | PurpleSslOps * |
| 296 | purple_ssl_get_ops(void) | |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
297 | { |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
298 | return _ssl_ops; |
| 6703 | 299 | } |
| 300 | ||
| 301 | void | |
| 15884 | 302 | purple_ssl_init(void) |
| 6703 | 303 | { |
|
19357
70ea09942a62
- Force full initialization of SSL system at startup
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18587
diff
changeset
|
304 | /* 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
|
305 | 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
|
306 | 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
|
307 | if (!ssl_init()) { |
|
2071903c58e4
Fix the win32 build for the cert SoC branch merge.
Daniel Atallah <datallah@pidgin.im>
parents:
19357
diff
changeset
|
308 | 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
|
309 | } |
| 6703 | 310 | } |
| 311 | ||
| 312 | void | |
| 15884 | 313 | purple_ssl_uninit(void) |
| 6703 | 314 | { |
| 15884 | 315 | PurpleSslOps *ops; |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
316 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
317 | if (!_ssl_initialized) |
| 6703 | 318 | return; |
| 319 | ||
| 15884 | 320 | ops = purple_ssl_get_ops(); |
|
14222
71d8761db708
[gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
321 | ops->uninit(); |
|
6738
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
322 | |
|
aa797bcc69dd
[gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents:
6735
diff
changeset
|
323 | _ssl_initialized = FALSE; |
| 6703 | 324 | } |