libpurple/sslconn.c

Sun, 15 May 2016 15:32:05 -0300

author
Florian Quèze <florian@instantbird.org>
date
Sun, 15 May 2016 15:32:05 -0300
changeset 37679
6ff708c38c04
parent 37635
e6ccacaa6322
child 37682
c49f5f42b10e
permissions
-rw-r--r--

Add "account-status-changing" signal from instantbird

It's like "account-status-changed", but emitted before the status change
instead of after.

Instantbird ticket: https://bugzilla.mozilla.org/show_bug.cgi?id=954403

20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
1 /* purple
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
2 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
3 * Purple is the legal property of its developers, whose names are too numerous
8046
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 7863
diff changeset
4 * to list here. Please refer to the COPYRIGHT file distributed with this
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 7863
diff changeset
5 * source distribution.
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
6 *
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
7 * This program is free software; you can redistribute it and/or modify
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
10 * (at your option) any later version.
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
11 *
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful,
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
15 * GNU General Public License for more details.
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
16 *
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
18 * 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
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
20 */
24569
5dbd0617a27d Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
Richard Laager <rlaager@pidgin.im>
parents: 24116
diff changeset
21 #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
22
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
23 #include "internal.h"
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
24
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
25 #include "debug.h"
36509
86e882c3cfdf Refactored libpurple according to the changes
Ankit Vani <a@nevitus.org>
parents: 36431
diff changeset
26 #include "plugins.h"
24116
56d1536da928 Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 20147
diff changeset
27 #include "request.h"
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
28 #include "sslconn.h"
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
29 #include "tls-certificate.h"
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
30
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
31 static void
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
32 emit_error(PurpleSslConnection *gsc, int error_code)
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
33 {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
34 if (gsc->error_cb != NULL)
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
35 gsc->error_cb(gsc, error_code, gsc->connect_cb_data);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
36 }
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
37
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
38 static void
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
39 tls_handshake_cb(GObject *source, GAsyncResult *res, gpointer user_data)
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
40 {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
41 PurpleSslConnection *gsc = user_data;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
42 GError *error = NULL;
7018
c441ecf99639 [gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents: 7016
diff changeset
43
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
44 if (!g_tls_connection_handshake_finish(G_TLS_CONNECTION(source), res,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
45 &error)) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
46 if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
47 /* Connection already closed/freed. Escape. */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
48 return;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
49 } else if (g_error_matches(error, G_TLS_ERROR,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
50 G_TLS_ERROR_HANDSHAKE)) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
51 /* In Gio, a handshake error is because of the cert */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
52 emit_error(gsc, PURPLE_SSL_CERTIFICATE_INVALID);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
53 } else {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
54 /* Report any other errors as handshake failing */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
55 emit_error(gsc, PURPLE_SSL_HANDSHAKE_FAILED);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
56 }
7018
c441ecf99639 [gaim-migrate @ 7581]
Christian Hammond <chipx86@chipx86.com>
parents: 7016
diff changeset
57
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
58 purple_ssl_close(gsc);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
59 return;
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
60 }
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
61
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
62 gsc->connect_cb(gsc->connect_cb_data, gsc, PURPLE_INPUT_READ);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
63 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
64
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
65 static gboolean
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
66 tls_connect(PurpleSslConnection *gsc)
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
67 {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
68 GSocket *socket;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
69 GSocketConnection *conn;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
70 GSocketConnectable *identity;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
71 GIOStream *tls_conn;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
72 GError *error = NULL;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
73
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
74 g_return_val_if_fail(gsc->conn == NULL, FALSE);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
75
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
76 socket = g_socket_new_from_fd(gsc->fd, &error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
77 if (socket == NULL) {
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
78 purple_debug_warning("sslconn",
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
79 "Error creating socket from fd (%u): %s",
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
80 gsc->fd, error->message);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
81 g_clear_error(&error);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
82 return FALSE;
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
83 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
84
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
85 conn = g_socket_connection_factory_create_connection(socket);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
86 g_object_unref(socket);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
87
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
88 identity = g_network_address_new(gsc->host, gsc->port);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
89 tls_conn = g_tls_client_connection_new(G_IO_STREAM(conn), identity,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
90 &error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
91 g_object_unref(identity);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
92 g_object_unref(conn);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
93
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
94 if (tls_conn == NULL) {
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
95 purple_debug_warning("sslconn",
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
96 "Error creating TLS client connection: %s",
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
97 error->message);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
98 g_clear_error(&error);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
99 return FALSE;
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
100 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
101
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
102 gsc->conn = G_TLS_CONNECTION(tls_conn);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
103 gsc->cancellable = g_cancellable_new();
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
104
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
105 purple_tls_certificate_attach_to_tls_connection(gsc->conn);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
106
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
107 g_tls_connection_handshake_async(gsc->conn, G_PRIORITY_DEFAULT,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
108 gsc->cancellable, tls_handshake_cb, gsc);
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
109
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
110 return TRUE;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
111 }
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
112
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
113 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
114 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
115 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
116 PurpleSslConnection *gsc;
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
117
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
118 gsc = data;
14324
8cbedd82b6ac [gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
119 gsc->connect_data = NULL;
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
120
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
121 if (source < 0)
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
122 {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
123 emit_error(gsc, PURPLE_SSL_CONNECT_FAILED);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
124 purple_ssl_close(gsc);
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
125 return;
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
126 }
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
127
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
128 gsc->fd = source;
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
129
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
130 if (!tls_connect(gsc)) {
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
131 emit_error(gsc, PURPLE_SSL_CONNECT_FAILED);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
132 purple_ssl_close(gsc);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
133 }
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
134 }
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
135
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
136 PurpleSslConnection *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
137 purple_ssl_connect(PurpleAccount *account, const char *host, int port,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
138 PurpleSslInputFunction func, PurpleSslErrorFunction error_func,
7274
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
139 void *data)
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
140 {
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
141 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
142 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
143 }
7989c9bb5000 Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents: 25888
diff changeset
144
7989c9bb5000 Add purple_ssl_connect_with_ssl_cn, which takes a host to connect to
Paul Aurich <darkrain42@pidgin.im>
parents: 25888
diff changeset
145 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
146 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
147 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
148 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
149 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
150 PurpleSslConnection *gsc;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
151
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
152 g_return_val_if_fail(host != NULL, NULL);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
153 g_return_val_if_fail(port != 0 && port != -1, NULL);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
154 g_return_val_if_fail(func != NULL, NULL);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
155
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
156 gsc = g_new0(PurpleSslConnection, 1);
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
157
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
158 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
159 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
160 gsc->port = port;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
161 gsc->connect_cb_data = data;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
162 gsc->connect_cb = func;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
163 gsc->error_cb = error_func;
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
164
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
165 gsc->connect_data = purple_proxy_connect(NULL, account, host, port, purple_ssl_connect_cb, gsc);
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
166
14324
8cbedd82b6ac [gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
167 if (gsc->connect_data == NULL)
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
168 {
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
169 g_free(gsc->host);
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
170 g_free(gsc);
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
171
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
172 return NULL;
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
173 }
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
174
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
175 return (PurpleSslConnection *)gsc;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
176 }
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
177
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
178 static gboolean
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
179 recv_cb(GObject *source, gpointer data)
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
180 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
181 PurpleSslConnection *gsc = data;
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
182
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
183 gsc->recv_cb(gsc->recv_cb_data, gsc, PURPLE_INPUT_READ);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
184
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
185 return TRUE;
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
186 }
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
187
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
188 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
189 purple_ssl_input_add(PurpleSslConnection *gsc, PurpleSslInputFunction func,
7274
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
190 void *data)
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
191 {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
192 GInputStream *input;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
193 GSource *source;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
194
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
195 g_return_if_fail(func != NULL);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
196 g_return_if_fail(gsc->conn != NULL);
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
197
34262
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
198 purple_ssl_input_remove(gsc);
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
199
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
200 gsc->recv_cb_data = data;
7274
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
201 gsc->recv_cb = func;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
202
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
203 input = g_io_stream_get_input_stream(G_IO_STREAM(gsc->conn));
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
204 /* Pass NULL for cancellable as we don't want it notified on cancel */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
205 source = g_pollable_input_stream_create_source(
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
206 G_POLLABLE_INPUT_STREAM(input), NULL);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
207 g_source_set_callback(source, (GSourceFunc)recv_cb, gsc, NULL);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
208 gsc->inpa = g_source_attach(source, NULL);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
209 g_source_unref(source);
6764
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
210 }
a3f8025c0631 [gaim-migrate @ 7296]
Nathan Walp <nwalp@pidgin.im>
parents: 6762
diff changeset
211
34262
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
212 void
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
213 purple_ssl_input_remove(PurpleSslConnection *gsc)
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
214 {
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
215 if (gsc->inpa > 0) {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
216 g_source_remove(gsc->inpa);
34262
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
217 gsc->inpa = 0;
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
218 }
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
219 }
3b8ce83bac96 HTTP: get rid of one (of two) msn's own http implementations
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 32438
diff changeset
220
18487
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
221 const gchar *
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
222 purple_ssl_strerror(PurpleSslErrorType error)
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
223 {
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
224 switch(error) {
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
225 case PURPLE_SSL_CONNECT_FAILED:
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
226 return _("SSL Connection Failed");
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
227 case PURPLE_SSL_HANDSHAKE_FAILED:
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
228 return _("SSL Handshake Failed");
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
229 case PURPLE_SSL_CERTIFICATE_INVALID:
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
230 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
231 default:
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
232 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
233 return _("Unknown SSL error");
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
234 }
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
235 }
0730e45141fd - Add purple_ssl_strerror for handy error description power!
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18478
diff changeset
236
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
237 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
238 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
239 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
240 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
241 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
242 void *data)
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
243 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
244 PurpleSslConnection *gsc;
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
245
14048
b577c53406c0 [gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents: 13664
diff changeset
246 g_return_val_if_fail(fd != -1, NULL);
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
247 g_return_val_if_fail(func != NULL, NULL);
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
248
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
249 gsc = g_new0(PurpleSslConnection, 1);
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
250
7274
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
251 gsc->connect_cb_data = data;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
252 gsc->connect_cb = func;
42ec5f56e32a [gaim-migrate @ 7851]
Christian Hammond <chipx86@chipx86.com>
parents: 7024
diff changeset
253 gsc->error_cb = error_func;
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
254 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
255 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
256 gsc->host = g_strdup(host);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
257 gsc->cancellable = g_cancellable_new();
18587
f5ce93d75799 (this revision will be disapproved)
William Ehlhardt <williamehlhardt@gmail.com>
parents: 18586
diff changeset
258
37634
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
259 if (!tls_connect(gsc)) {
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
260 emit_error(gsc, PURPLE_SSL_CONNECT_FAILED);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
261 g_clear_pointer(&gsc, purple_ssl_close);
ee6f9faeee6f sslconn: Clean up tls_connect() function error paths
Mike Ruprecht <cmaiku@gmail.com>
parents: 37631
diff changeset
262 }
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
263
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
264 return (PurpleSslConnection *)gsc;
6762
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
265 }
2349053f14aa [gaim-migrate @ 7294]
Christian Hammond <chipx86@chipx86.com>
parents: 6745
diff changeset
266
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
267 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
268 purple_ssl_close(PurpleSslConnection *gsc)
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
269 {
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
270 g_return_if_fail(gsc != NULL);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
271
24116
56d1536da928 Close notify and request dialogs with PurpleSslConnection as handle.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 20147
diff changeset
272 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
273 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
274
14324
8cbedd82b6ac [gaim-migrate @ 16944]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
275 if (gsc->connect_data != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
276 purple_proxy_connect_cancel(gsc->connect_data);
14222
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
277
71d8761db708 [gaim-migrate @ 16808]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
278 if (gsc->inpa > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
279 purple_input_remove(gsc->inpa);
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
280
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
281 /* Stop any pending operations */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
282 if (G_IS_CANCELLABLE(gsc->cancellable)) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
283 g_cancellable_cancel(gsc->cancellable);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
284 g_clear_object(&gsc->cancellable);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
285 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
286
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
287 if (gsc->conn != NULL) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
288 /* Close the stream. Shouldn't take long and it can't
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
289 * be further cancelled so don't pass a cancellable
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
290 */
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
291 g_io_stream_close(G_IO_STREAM(gsc->conn), NULL, NULL);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
292 g_clear_object(&gsc->conn);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
293 }
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
294
14048
b577c53406c0 [gaim-migrate @ 16556]
Mark Doliner <markdoliner@pidgin.im>
parents: 13664
diff changeset
295 g_free(gsc->host);
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
296 g_free(gsc);
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
297 }
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
298
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
299 size_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
300 purple_ssl_read(PurpleSslConnection *gsc, void *data, size_t len)
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
301 {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
302 GInputStream *input;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
303 gssize outlen;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
304 GError *error = NULL;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
305
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
306 g_return_val_if_fail(gsc != NULL, 0);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
307 g_return_val_if_fail(data != NULL, 0);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
308 g_return_val_if_fail(len > 0, 0);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
309 g_return_val_if_fail(gsc->conn != NULL, 0);
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
310
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
311 input = g_io_stream_get_input_stream(G_IO_STREAM(gsc->conn));
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
312 outlen = g_pollable_input_stream_read_nonblocking(
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
313 G_POLLABLE_INPUT_STREAM(input), data, len,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
314 gsc->cancellable, &error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
315
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
316 if (outlen < 0) {
37631
30cc3ef7c5d3 Fix handling EAGAIN in purple_ssl_read()
Mike Ruprecht <cmaiku@gmail.com>
parents: 37630
diff changeset
317 if (g_error_matches(error, G_IO_ERROR,
30cc3ef7c5d3 Fix handling EAGAIN in purple_ssl_read()
Mike Ruprecht <cmaiku@gmail.com>
parents: 37630
diff changeset
318 G_IO_ERROR_WOULD_BLOCK)) {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
319 errno = EAGAIN;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
320 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
321
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
322 g_clear_error(&error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
323 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
324
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
325 return outlen;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
326 }
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
327
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
328 size_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
329 purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
330 {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
331 GOutputStream *output;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
332 gssize outlen;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
333 GError *error = NULL;
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
334
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
335 g_return_val_if_fail(gsc != NULL, 0);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
336 g_return_val_if_fail(data != NULL, 0);
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
337 g_return_val_if_fail(len > 0, 0);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
338 g_return_val_if_fail(gsc->conn != NULL, 0);
6703
6f9d558270c9 [gaim-migrate @ 7229]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
339
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
340 output = g_io_stream_get_output_stream(G_IO_STREAM(gsc->conn));
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
341 outlen = g_pollable_output_stream_write_nonblocking(
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
342 G_POLLABLE_OUTPUT_STREAM(output), data, len,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
343 gsc->cancellable, &error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
344
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
345 if (outlen < 0) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
346 if (g_error_matches(error, G_IO_ERROR,
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
347 G_IO_ERROR_WOULD_BLOCK)) {
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
348 errno = EAGAIN;
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
349 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
350
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
351 g_clear_error(&error);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
352 }
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
353
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
354 return outlen;
6738
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
355 }
aa797bcc69dd [gaim-migrate @ 7270]
Christian Hammond <chipx86@chipx86.com>
parents: 6735
diff changeset
356
18451
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
357 GList *
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
358 purple_ssl_get_peer_certificates(PurpleSslConnection *gsc)
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
359 {
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
360 GTlsCertificate *certificate;
18451
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
361
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
362 g_return_val_if_fail(gsc != NULL, NULL);
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
363 g_return_val_if_fail(gsc->conn != NULL, NULL);
18451
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
364
37623
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
365 certificate = g_tls_connection_get_peer_certificate(gsc->conn);
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
366
53718d3c53f0 Port sslconn.[ch] to Gio
Mike Ruprecht <cmaiku@gmail.com>
parents: 37417
diff changeset
367 return certificate != NULL ? g_list_append(NULL, certificate) : NULL;
18451
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
368 }
304d2fa12f6a - purple_ssl_get_peer_certificates
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17765
diff changeset
369

mercurial