Sat, 29 Sep 2007 13:54:38 +0000
applied changes from 54b7bcca130674c9f93777772bdf3d08237a7951
through 27d49044df2da785a519726b37211c6c5218bc41
| 7016 | 1 | /** |
| 2 | * @file ssl-gnutls.c GNUTLS SSL plugin. | |
| 3 | * | |
| 15884 | 4 | * purple |
| 7016 | 5 | * |
| 6 | * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> | |
| 7 | * | |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * it under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * 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:
19827
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 7016 | 21 | */ |
| 22 | #include "internal.h" | |
|
7051
8ddb8f560399
[gaim-migrate @ 7614]
Christian Hammond <chipx86@chipx86.com>
parents:
7050
diff
changeset
|
23 | #include "debug.h" |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
24 | #include "certificate.h" |
| 7016 | 25 | #include "plugin.h" |
|
7051
8ddb8f560399
[gaim-migrate @ 7614]
Christian Hammond <chipx86@chipx86.com>
parents:
7050
diff
changeset
|
26 | #include "sslconn.h" |
| 9943 | 27 | #include "version.h" |
|
17390
7fda160e7c5e
- Made a big mess of stuff in the GnuTLS pluging to look at cert auth
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17345
diff
changeset
|
28 | #include "util.h" |
| 7016 | 29 | |
| 30 | #define SSL_GNUTLS_PLUGIN_ID "ssl-gnutls" | |
| 31 | ||
| 32 | #ifdef HAVE_GNUTLS | |
| 33 | ||
| 34 | #include <gnutls/gnutls.h> | |
|
17390
7fda160e7c5e
- Made a big mess of stuff in the GnuTLS pluging to look at cert auth
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17345
diff
changeset
|
35 | #include <gnutls/x509.h> |
| 7016 | 36 | |
| 37 | typedef struct | |
| 38 | { | |
| 39 | gnutls_session session; | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
40 | guint handshake_handler; |
| 15884 | 41 | } PurpleSslGnutlsData; |
| 7016 | 42 | |
| 15884 | 43 | #define PURPLE_SSL_GNUTLS_DATA(gsc) ((PurpleSslGnutlsData *)gsc->private_data) |
| 7016 | 44 | |
| 45 | static gnutls_certificate_client_credentials xcred; | |
| 46 | ||
|
7862
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
47 | static void |
|
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
48 | ssl_gnutls_init_gnutls(void) |
| 7016 | 49 | { |
|
17507
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
50 | /* Configure GnuTLS to use glib memory management */ |
|
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
51 | /* I expect that this isn't really necessary, but it may prevent |
|
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
52 | some bugs */ |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
53 | /* TODO: It may be necessary to wrap this allocators for GnuTLS. |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
54 | If there are strange bugs, perhaps look here (yes, I am a |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
55 | hypocrite) */ |
|
17507
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
56 | gnutls_global_set_mem_functions( |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
57 | (gnutls_alloc_function) g_malloc0, /* malloc */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
58 | (gnutls_alloc_function) g_malloc0, /* secure malloc */ |
|
17507
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
59 | NULL, /* mem_is_secure */ |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
60 | (gnutls_realloc_function) g_realloc, /* realloc */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
61 | (gnutls_free_function) g_free /* free */ |
|
17507
849f15622ee5
- GnuTLS uses glib memory mgmt
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17442
diff
changeset
|
62 | ); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
63 | |
| 7016 | 64 | gnutls_global_init(); |
| 65 | ||
| 66 | gnutls_certificate_allocate_credentials(&xcred); | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
67 | |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
68 | /* TODO: I can likely remove this */ |
|
17430
95d550efcc3d
disapproval of revision '8976f9e287fef5bd2856c34ea931afa70a997895'
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17429
diff
changeset
|
69 | gnutls_certificate_set_x509_trust_file(xcred, "ca.pem", |
|
95d550efcc3d
disapproval of revision '8976f9e287fef5bd2856c34ea931afa70a997895'
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17429
diff
changeset
|
70 | GNUTLS_X509_FMT_PEM); |
|
7862
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
71 | } |
| 7016 | 72 | |
|
7862
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
73 | static gboolean |
|
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
74 | ssl_gnutls_init(void) |
|
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
75 | { |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
76 | return TRUE; |
| 7016 | 77 | } |
| 78 | ||
| 79 | static void | |
| 80 | ssl_gnutls_uninit(void) | |
| 81 | { | |
| 82 | gnutls_global_deinit(); | |
| 83 | ||
| 84 | gnutls_certificate_free_credentials(xcred); | |
| 85 | } | |
| 86 | ||
|
18475
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
87 | static void |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
88 | ssl_gnutls_verified_cb(PurpleCertificateVerificationStatus st, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
89 | gpointer userdata) |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
90 | { |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
91 | PurpleSslConnection *gsc = (PurpleSslConnection *) userdata; |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
92 | |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
93 | if (st == PURPLE_CERTIFICATE_VALID) { |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
94 | /* Certificate valid? Good! Do the connection! */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
95 | gsc->connect_cb(gsc->connect_cb_data, gsc, PURPLE_INPUT_READ); |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
96 | } else { |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
97 | /* Otherwise, signal an error */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
98 | if(gsc->error_cb != NULL) |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
99 | gsc->error_cb(gsc, PURPLE_SSL_CERTIFICATE_INVALID, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
100 | gsc->connect_cb_data); |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
101 | purple_ssl_close(gsc); |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
102 | } |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
103 | } |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
104 | |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
105 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
106 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
107 | static void ssl_gnutls_handshake_cb(gpointer data, gint source, |
| 15884 | 108 | PurpleInputCondition cond) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
109 | { |
| 15884 | 110 | PurpleSslConnection *gsc = data; |
| 111 | PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
112 | ssize_t ret; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
113 | |
|
20151
0b5ba1105191
applied changes from 5252885d793a4d288d92856d511d721bf5bb87ef
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
114 | /*purple_debug_info("gnutls", "Handshaking with %s\n", gsc->host);*/ |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
115 | ret = gnutls_handshake(gnutls_data->session); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
116 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
117 | if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
118 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
119 | |
| 15884 | 120 | purple_input_remove(gnutls_data->handshake_handler); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
121 | gnutls_data->handshake_handler = 0; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
122 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
123 | if(ret != 0) { |
| 15884 | 124 | purple_debug_error("gnutls", "Handshake failed. Error %s\n", |
|
15846
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
125 | gnutls_strerror(ret)); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
126 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
127 | if(gsc->error_cb != NULL) |
| 15884 | 128 | gsc->error_cb(gsc, PURPLE_SSL_HANDSHAKE_FAILED, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
129 | gsc->connect_cb_data); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
130 | |
| 15884 | 131 | purple_ssl_close(gsc); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
132 | } else { |
|
18458
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
133 | /* Now we are cooking with gas! */ |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
134 | PurpleSslOps *ops = purple_ssl_get_ops(); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
135 | GList * peers = ops->get_peer_certificates(gsc); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
136 | |
|
18458
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
137 | PurpleCertificateScheme *x509 = |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
138 | purple_certificate_find_scheme("x509"); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
139 | |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
140 | GList * l; |
|
19711
19b0780efe0e
Fix compiler warnings about having a variable declaration after some
Mark Doliner <markdoliner@pidgin.im>
parents:
19501
diff
changeset
|
141 | |
|
19b0780efe0e
Fix compiler warnings about having a variable declaration after some
Mark Doliner <markdoliner@pidgin.im>
parents:
19501
diff
changeset
|
142 | /* TODO: Remove all this debugging babble */ |
|
19b0780efe0e
Fix compiler warnings about having a variable declaration after some
Mark Doliner <markdoliner@pidgin.im>
parents:
19501
diff
changeset
|
143 | purple_debug_info("gnutls", "Handshake complete\n"); |
|
19b0780efe0e
Fix compiler warnings about having a variable declaration after some
Mark Doliner <markdoliner@pidgin.im>
parents:
19501
diff
changeset
|
144 | |
|
18458
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
145 | for (l=peers; l; l = l->next) { |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
146 | PurpleCertificate *crt = l->data; |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
147 | GByteArray *z = |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
148 | x509->get_fingerprint_sha1(crt); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
149 | gchar * fpr = |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
150 | purple_base16_encode_chunked(z->data, |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
151 | z->len); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
152 | |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
153 | purple_debug_info("gnutls/x509", |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
154 | "Key print: %s\n", |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
155 | fpr); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
156 | |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
157 | /* Kill the cert! */ |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
158 | x509->destroy_certificate(crt); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
159 | |
|
18458
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
160 | g_free(fpr); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
161 | g_byte_array_free(z, TRUE); |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
162 | } |
|
e2f60e9d44aa
- Add debugging babble
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18455
diff
changeset
|
163 | g_list_free(peers); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
164 | |
|
17390
7fda160e7c5e
- Made a big mess of stuff in the GnuTLS pluging to look at cert auth
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17345
diff
changeset
|
165 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
166 | const gnutls_datum *cert_list; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
167 | unsigned int cert_list_size = 0; |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
168 | gnutls_session session=gnutls_data->session; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
169 | int i; |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
170 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
171 | cert_list = |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
172 | gnutls_certificate_get_peers(session, &cert_list_size); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
173 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
174 | purple_debug_info("gnutls", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
175 | "Peer provided %d certs\n", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
176 | cert_list_size); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
177 | for (i=0; i<cert_list_size; i++) |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
178 | { |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
179 | gchar fpr_bin[256]; |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
180 | gsize fpr_bin_sz = sizeof(fpr_bin); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
181 | gchar * fpr_asc = NULL; |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
182 | gchar tbuf[256]; |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
183 | gsize tsz=sizeof(tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
184 | gchar * tasc = NULL; |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
185 | gnutls_x509_crt cert; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
186 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
187 | gnutls_x509_crt_init(&cert); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
188 | gnutls_x509_crt_import (cert, &cert_list[i], |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
189 | GNUTLS_X509_FMT_DER); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
190 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
191 | gnutls_x509_crt_get_fingerprint(cert, GNUTLS_MAC_SHA, |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
192 | fpr_bin, &fpr_bin_sz); |
|
17390
7fda160e7c5e
- Made a big mess of stuff in the GnuTLS pluging to look at cert auth
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17345
diff
changeset
|
193 | |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
194 | fpr_asc = |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
195 | purple_base16_encode_chunked((const guchar *)fpr_bin, fpr_bin_sz); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
196 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
197 | purple_debug_info("gnutls", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
198 | "Lvl %d SHA1 fingerprint: %s\n", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
199 | i, fpr_asc); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
200 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
201 | tsz=sizeof(tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
202 | gnutls_x509_crt_get_serial(cert,tbuf,&tsz); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
203 | tasc=purple_base16_encode_chunked((const guchar *)tbuf, tsz); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
204 | purple_debug_info("gnutls", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
205 | "Serial: %s\n", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
206 | tasc); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
207 | g_free(tasc); |
|
17390
7fda160e7c5e
- Made a big mess of stuff in the GnuTLS pluging to look at cert auth
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17345
diff
changeset
|
208 | |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
209 | tsz=sizeof(tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
210 | gnutls_x509_crt_get_dn (cert, tbuf, &tsz); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
211 | purple_debug_info("gnutls", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
212 | "Cert DN: %s\n", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
213 | tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
214 | tsz=sizeof(tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
215 | gnutls_x509_crt_get_issuer_dn (cert, tbuf, &tsz); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
216 | purple_debug_info("gnutls", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
217 | "Cert Issuer DN: %s\n", |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
218 | tbuf); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
219 | |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
220 | g_free(fpr_asc); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
221 | fpr_asc = NULL; |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
222 | gnutls_x509_crt_deinit(cert); |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
223 | } |
|
17430
95d550efcc3d
disapproval of revision '8976f9e287fef5bd2856c34ea931afa70a997895'
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17429
diff
changeset
|
224 | } |
|
18475
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
225 | |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
226 | /* TODO: The following logic should really be in libpurple */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
227 | /* If a Verifier was given, hand control over to it */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
228 | if (gsc->verifier) { |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
229 | GList *peers; |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
230 | /* First, get the peer cert chain */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
231 | peers = purple_ssl_get_peer_certificates(gsc); |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
232 | |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
233 | /* Now kick off the verification process */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
234 | purple_certificate_verify(gsc->verifier, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
235 | gsc->host, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
236 | peers, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
237 | ssl_gnutls_verified_cb, |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
238 | gsc); |
|
18656
02c822b398d2
- purple_certificate_verify no longer takes possession of the
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18654
diff
changeset
|
239 | |
|
02c822b398d2
- purple_certificate_verify no longer takes possession of the
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18654
diff
changeset
|
240 | purple_certificate_destroy_list(peers); |
|
18475
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
241 | } else { |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
242 | /* Otherwise, just call the "connection complete" |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
243 | callback */ |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
244 | gsc->connect_cb(gsc->connect_cb_data, gsc, cond); |
|
e3893e58c4c2
- ssl-gnutls plugin uses Verifiers now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18458
diff
changeset
|
245 | } |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
246 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
247 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
248 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
249 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
250 | |
| 7016 | 251 | static void |
| 15884 | 252 | ssl_gnutls_connect(PurpleSslConnection *gsc) |
| 7016 | 253 | { |
| 15884 | 254 | PurpleSslGnutlsData *gnutls_data; |
| 7016 | 255 | static const int cert_type_priority[2] = { GNUTLS_CRT_X509, 0 }; |
| 256 | ||
| 15884 | 257 | gnutls_data = g_new0(PurpleSslGnutlsData, 1); |
| 7016 | 258 | gsc->private_data = gnutls_data; |
| 259 | ||
| 260 | gnutls_init(&gnutls_data->session, GNUTLS_CLIENT); | |
| 261 | gnutls_set_default_priority(gnutls_data->session); | |
| 262 | ||
| 263 | gnutls_certificate_type_set_priority(gnutls_data->session, | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
264 | cert_type_priority); |
| 7016 | 265 | |
| 266 | gnutls_credentials_set(gnutls_data->session, GNUTLS_CRD_CERTIFICATE, | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
267 | xcred); |
| 7016 | 268 | |
|
14223
c6ba4f3482de
[gaim-migrate @ 16809]
Mark Doliner <markdoliner@pidgin.im>
parents:
13985
diff
changeset
|
269 | gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd)); |
| 7016 | 270 | |
| 15884 | 271 | gnutls_data->handshake_handler = purple_input_add(gsc->fd, |
| 272 | PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc); | |
| 7016 | 273 | |
|
20151
0b5ba1105191
applied changes from 5252885d793a4d288d92856d511d721bf5bb87ef
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
274 | purple_debug_info("gnutls", "Starting handshake with %s\n", gsc->host); |
|
0b5ba1105191
applied changes from 5252885d793a4d288d92856d511d721bf5bb87ef
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
275 | |
|
17345
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
276 | /* Orborde asks: Why are we configuring a callback, then |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
277 | immediately calling it? |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
278 | |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
279 | Answer: gnutls_handshake (up in handshake_cb) needs to be called |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
280 | once in order to get the ball rolling on the SSL connection. |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
281 | Once it has done so, only then will the server reply, triggering |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
282 | the callback. |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
283 | |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
284 | Since the logic driving gnutls_handshake is the same with the first |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
285 | and subsequent calls, we'll just fire the callback immediately to |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
286 | accomplish this. |
|
cbe9758e542e
- Document some weird-looking logic in the GnuTLS plugin.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
16744
diff
changeset
|
287 | */ |
| 15884 | 288 | ssl_gnutls_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ); |
| 7016 | 289 | } |
| 290 | ||
| 291 | static void | |
| 15884 | 292 | ssl_gnutls_close(PurpleSslConnection *gsc) |
| 7016 | 293 | { |
| 15884 | 294 | PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); |
| 7016 | 295 | |
| 7467 | 296 | if(!gnutls_data) |
| 297 | return; | |
| 298 | ||
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
299 | if(gnutls_data->handshake_handler) |
| 15884 | 300 | purple_input_remove(gnutls_data->handshake_handler); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
301 | |
| 7016 | 302 | gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR); |
| 303 | ||
| 304 | gnutls_deinit(gnutls_data->session); | |
| 305 | ||
| 306 | g_free(gnutls_data); | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
307 | gsc->private_data = NULL; |
| 7016 | 308 | } |
| 309 | ||
| 310 | static size_t | |
| 15884 | 311 | ssl_gnutls_read(PurpleSslConnection *gsc, void *data, size_t len) |
| 7016 | 312 | { |
| 15884 | 313 | PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
314 | ssize_t s; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
315 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
316 | s = gnutls_record_recv(gnutls_data->session, data, len); |
| 7016 | 317 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
318 | if(s == GNUTLS_E_AGAIN || s == GNUTLS_E_INTERRUPTED) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
319 | s = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
320 | errno = EAGAIN; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
321 | } else if(s < 0) { |
| 15884 | 322 | purple_debug_error("gnutls", "receive failed: %s\n", |
|
15846
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
323 | gnutls_strerror(s)); |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
324 | s = -1; |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
325 | /* |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
326 | * TODO: Set errno to something more appropriate. Or even |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
327 | * better: allow ssl plugins to keep track of their |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
328 | * own error message, then add a new ssl_ops function |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
329 | * that returns the error message. |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
330 | */ |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
331 | errno = EIO; |
| 7834 | 332 | } |
| 7016 | 333 | |
| 334 | return s; | |
| 335 | } | |
| 336 | ||
| 337 | static size_t | |
| 15884 | 338 | ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len) |
| 7016 | 339 | { |
| 15884 | 340 | PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
341 | ssize_t s = 0; |
| 7016 | 342 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
343 | /* XXX: when will gnutls_data be NULL? */ |
| 7467 | 344 | if(gnutls_data) |
| 345 | s = gnutls_record_send(gnutls_data->session, data, len); | |
| 7016 | 346 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
347 | if(s == GNUTLS_E_AGAIN || s == GNUTLS_E_INTERRUPTED) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
348 | s = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
349 | errno = EAGAIN; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
350 | } else if(s < 0) { |
| 15884 | 351 | purple_debug_error("gnutls", "send failed: %s\n", |
|
15846
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
352 | gnutls_strerror(s)); |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
353 | s = -1; |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
354 | /* |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
355 | * TODO: Set errno to something more appropriate. Or even |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
356 | * better: allow ssl plugins to keep track of their |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
357 | * own error message, then add a new ssl_ops function |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
358 | * that returns the error message. |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
359 | */ |
|
7a956b382f6c
There were a few problems here
Mark Doliner <markdoliner@pidgin.im>
parents:
15435
diff
changeset
|
360 | errno = EIO; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
361 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11513
diff
changeset
|
362 | |
| 7016 | 363 | return s; |
| 364 | } | |
| 365 | ||
|
19494
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
366 | /* Forward declarations are fun! */ |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
367 | static PurpleCertificate * |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
368 | x509_import_from_datum(const gnutls_datum dt, gnutls_x509_crt_fmt mode); |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
369 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
370 | static GList * |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
371 | ssl_gnutls_get_peer_certificates(PurpleSslConnection * gsc) |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
372 | { |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
373 | PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
374 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
375 | /* List of Certificate instances to return */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
376 | GList * peer_certs = NULL; |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
377 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
378 | /* List of raw certificates as given by GnuTLS */ |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
379 | const gnutls_datum *cert_list; |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
380 | unsigned int cert_list_size = 0; |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
381 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
382 | unsigned int i; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
383 | |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
384 | /* This should never, ever happen. */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
385 | g_return_val_if_fail( gnutls_certificate_type_get (gnutls_data->session) == GNUTLS_CRT_X509, NULL); |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
386 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
387 | /* Get the certificate list from GnuTLS */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
388 | /* TODO: I am _pretty sure_ this doesn't block or do other exciting things */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
389 | cert_list = gnutls_certificate_get_peers(gnutls_data->session, |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
390 | &cert_list_size); |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
391 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
392 | /* Convert each certificate to a Certificate and append it to the list */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
393 | for (i = 0; i < cert_list_size; i++) { |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
394 | PurpleCertificate * newcrt = x509_import_from_datum(cert_list[i], |
|
18245
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
395 | GNUTLS_X509_FMT_DER); |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
396 | /* Append is somewhat inefficient on linked lists, but is easy |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
397 | to read. If someone complains, I'll change it. |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
398 | TODO: Is anyone complaining? (Maybe elb?) */ |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
399 | peer_certs = g_list_append(peer_certs, newcrt); |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
400 | } |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
401 | |
|
19494
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
402 | /* cert_list doesn't need free()-ing */ |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
403 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
404 | return peer_certs; |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
405 | } |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
406 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
407 | /************************************************************************/ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
408 | /* X.509 functionality */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
409 | /************************************************************************/ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
410 | const gchar * SCHEME_NAME = "x509"; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
411 | |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
412 | static PurpleCertificateScheme x509_gnutls; |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
413 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
414 | /** Refcounted GnuTLS certificate data instance */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
415 | typedef struct { |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
416 | gint refcount; |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
417 | gnutls_x509_crt crt; |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
418 | } x509_crtdata_t; |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
419 | |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
420 | /** Helper functions for reference counting */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
421 | static x509_crtdata_t * |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
422 | x509_crtdata_addref(x509_crtdata_t *cd) |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
423 | { |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
424 | (cd->refcount)++; |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
425 | return cd; |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
426 | } |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
427 | |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
428 | static void |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
429 | x509_crtdata_delref(x509_crtdata_t *cd) |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
430 | { |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
431 | (cd->refcount)--; |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
432 | |
|
19714
b424012723a8
refcount of 0 is normal
Mark Doliner <markdoliner@pidgin.im>
parents:
19713
diff
changeset
|
433 | if (cd->refcount < 0) |
|
19713
d0456ce4f4e9
Replace a call to g_assert() with a logging statement
Mark Doliner <markdoliner@pidgin.im>
parents:
19712
diff
changeset
|
434 | g_critical("Refcount of x509_crtdata_t is %d, which is less " |
|
d0456ce4f4e9
Replace a call to g_assert() with a logging statement
Mark Doliner <markdoliner@pidgin.im>
parents:
19712
diff
changeset
|
435 | "than zero!\n", cd->refcount); |
|
d0456ce4f4e9
Replace a call to g_assert() with a logging statement
Mark Doliner <markdoliner@pidgin.im>
parents:
19712
diff
changeset
|
436 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
437 | /* If the refcount reaches zero, kill the structure */ |
|
19713
d0456ce4f4e9
Replace a call to g_assert() with a logging statement
Mark Doliner <markdoliner@pidgin.im>
parents:
19712
diff
changeset
|
438 | if (cd->refcount <= 0) { |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
439 | /* Kill the internal data */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
440 | gnutls_x509_crt_deinit( cd->crt ); |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
441 | /* And kill the struct */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
442 | g_free( cd ); |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
443 | } |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
444 | } |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
445 | |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
446 | /** Helper macro to retrieve the GnuTLS crt_t from a PurpleCertificate */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
447 | #define X509_GET_GNUTLS_DATA(pcrt) ( ((x509_crtdata_t *) (pcrt->data))->crt) |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
448 | |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
449 | /** Transforms a gnutls_datum containing an X.509 certificate into a Certificate instance under the x509_gnutls scheme |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
450 | * |
|
18245
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
451 | * @param dt Datum to transform |
|
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
452 | * @param mode GnuTLS certificate format specifier (GNUTLS_X509_FMT_PEM for |
|
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
453 | * reading from files, and GNUTLS_X509_FMT_DER for converting |
|
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
454 | * "over the wire" certs for SSL) |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
455 | * |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
456 | * @return A newly allocated Certificate structure of the x509_gnutls scheme |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
457 | */ |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
458 | static PurpleCertificate * |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
459 | x509_import_from_datum(const gnutls_datum dt, gnutls_x509_crt_fmt mode) |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
460 | { |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
461 | /* Internal certificate data structure */ |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
462 | x509_crtdata_t *certdat; |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
463 | /* New certificate to return */ |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
464 | PurpleCertificate * crt; |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
465 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
466 | /* Allocate and prepare the internal certificate data */ |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
467 | certdat = g_new0(x509_crtdata_t, 1); |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
468 | gnutls_x509_crt_init(&(certdat->crt)); |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
469 | certdat->refcount = 0; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
470 | |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
471 | /* Perform the actual certificate parse */ |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
472 | /* Yes, certdat->crt should be passed as-is */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
473 | gnutls_x509_crt_import(certdat->crt, &dt, mode); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
474 | |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
475 | /* Allocate the certificate and load it with data */ |
|
18480
42936c867fee
- More g_new0 instead of g_new
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18475
diff
changeset
|
476 | crt = g_new0(PurpleCertificate, 1); |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
477 | crt->scheme = &x509_gnutls; |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
478 | crt->data = x509_crtdata_addref(certdat); |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
479 | |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
480 | return crt; |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
481 | } |
|
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
482 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
483 | /** Imports a PEM-formatted X.509 certificate from the specified file. |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
484 | * @param filename Filename to import from. Format is PEM |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
485 | * |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
486 | * @return A newly allocated Certificate structure of the x509_gnutls scheme |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
487 | */ |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
488 | static PurpleCertificate * |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
489 | x509_import_from_file(const gchar * filename) |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
490 | { |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
491 | PurpleCertificate *crt; /* Certificate being constructed */ |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
492 | gchar *buf; /* Used to load the raw file data */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
493 | gsize buf_sz; /* Size of the above */ |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
494 | gnutls_datum dt; /* Struct to pass down to GnuTLS */ |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
495 | |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
496 | purple_debug_info("gnutls", |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
497 | "Attempting to load X.509 certificate from %s\n", |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
498 | filename); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
499 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
500 | /* Next, we'll simply yank the entire contents of the file |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
501 | into memory */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
502 | /* TODO: Should I worry about very large files here? */ |
|
19494
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
503 | g_return_val_if_fail( |
|
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
504 | g_file_get_contents(filename, |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
505 | &buf, |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
506 | &buf_sz, |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
507 | NULL /* No error checking for now */ |
|
19494
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
508 | ), |
|
c9ee38003eb6
- TODO-whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19359
diff
changeset
|
509 | NULL); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
510 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
511 | /* Load the datum struct */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
512 | dt.data = (unsigned char *) buf; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
513 | dt.size = buf_sz; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
514 | |
|
17510
b9314561d25a
- Wrote GnuTLS get_peer_certificates function
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17509
diff
changeset
|
515 | /* Perform the conversion */ |
|
18245
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
516 | crt = x509_import_from_datum(dt, |
|
2ddae03c3c9e
- Add a mode switch to allow DER or PEM imports (necessary because SSL certs
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17510
diff
changeset
|
517 | GNUTLS_X509_FMT_PEM); // files should be in PEM format |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
518 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
519 | /* Cleanup */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
520 | g_free(buf); |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
521 | |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
522 | return crt; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
523 | } |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
524 | |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
525 | /** |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
526 | * Exports a PEM-formatted X.509 certificate to the specified file. |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
527 | * @param filename Filename to export to. Format will be PEM |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
528 | * @param crt Certificate to export |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
529 | * |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
530 | * @return TRUE if success, otherwise FALSE |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
531 | */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
532 | static gboolean |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
533 | x509_export_certificate(const gchar *filename, PurpleCertificate *crt) |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
534 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
535 | gnutls_x509_crt crt_dat; /* GnuTLS cert struct */ |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
536 | int ret; |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
537 | gchar * out_buf; /* Data to output */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
538 | size_t out_size; /* Output size */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
539 | gboolean success = FALSE; |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
540 | |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
541 | /* Paranoia paranoia paranoia! */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
542 | g_return_val_if_fail(filename, FALSE); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
543 | g_return_val_if_fail(crt, FALSE); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
544 | g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
545 | g_return_val_if_fail(crt->data, FALSE); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
546 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
547 | crt_dat = X509_GET_GNUTLS_DATA(crt); |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
548 | |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
549 | /* Obtain the output size required */ |
|
18593
9d2bd532bf74
- Fix intermittent crash due to uninitialized variable
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18592
diff
changeset
|
550 | out_size = 0; |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
551 | ret = gnutls_x509_crt_export(crt_dat, GNUTLS_X509_FMT_PEM, |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
552 | NULL, /* Provide no buffer yet */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
553 | &out_size /* Put size here */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
554 | ); |
|
18591
9d7c99e312b9
- Fix an incorrect assertion in GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18496
diff
changeset
|
555 | g_return_val_if_fail(ret == GNUTLS_E_SHORT_MEMORY_BUFFER, FALSE); |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
556 | |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
557 | /* Now allocate a buffer and *really* export it */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
558 | out_buf = g_new0(gchar, out_size); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
559 | ret = gnutls_x509_crt_export(crt_dat, GNUTLS_X509_FMT_PEM, |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
560 | out_buf, /* Export to our new buffer */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
561 | &out_size /* Put size here */ |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
562 | ); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
563 | if (ret != 0) { |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
564 | purple_debug_error("gnutls/x509", |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
565 | "Failed to export cert to buffer with code %d\n", |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
566 | ret); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
567 | g_free(out_buf); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
568 | return FALSE; |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
569 | } |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
570 | |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
571 | /* Write it out to an actual file */ |
|
19501
4c14c89dcf02
- Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19497
diff
changeset
|
572 | success = purple_util_write_data_to_file_absolute(filename, |
|
4c14c89dcf02
- Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19497
diff
changeset
|
573 | out_buf, out_size); |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
574 | |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
575 | g_free(out_buf); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
576 | g_return_val_if_fail(success, FALSE); |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
577 | return success; |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
578 | } |
|
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
579 | |
|
18654
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
580 | static PurpleCertificate * |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
581 | x509_copy_certificate(PurpleCertificate *crt) |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
582 | { |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
583 | x509_crtdata_t *crtdat; |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
584 | PurpleCertificate *newcrt; |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
585 | |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
586 | g_return_val_if_fail(crt, NULL); |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
587 | g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL); |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
588 | |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
589 | crtdat = (x509_crtdata_t *) crt->data; |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
590 | |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
591 | newcrt = g_new0(PurpleCertificate, 1); |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
592 | newcrt->scheme = &x509_gnutls; |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
593 | newcrt->data = x509_crtdata_addref(crtdat); |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
594 | |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
595 | return newcrt; |
|
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
596 | } |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
597 | /** Frees a Certificate |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
598 | * |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
599 | * Destroys a Certificate's internal data structures and frees the pointer |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
600 | * given. |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
601 | * @param crt Certificate instance to be destroyed. It WILL NOT be destroyed |
|
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
602 | * if it is not of the correct CertificateScheme. Can be NULL |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
603 | * |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
604 | */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
605 | static void |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
606 | x509_destroy_certificate(PurpleCertificate * crt) |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
607 | { |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
608 | if (NULL == crt) return; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
609 | |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
610 | /* Check that the scheme is x509_gnutls */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
611 | if ( crt->scheme != &x509_gnutls ) { |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
612 | purple_debug_error("gnutls", |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
613 | "destroy_certificate attempted on certificate of wrong scheme (scheme was %s, expected %s)\n", |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
614 | crt->scheme->name, |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
615 | SCHEME_NAME); |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
616 | return; |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
617 | } |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
618 | |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
619 | g_return_if_fail(crt->data != NULL); |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
620 | g_return_if_fail(crt->scheme != NULL); |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
621 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
622 | /* Use the reference counting system to free (or not) the |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
623 | underlying data */ |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
624 | x509_crtdata_delref((x509_crtdata_t *)crt->data); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
625 | |
|
17509
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
626 | /* Kill the structure itself */ |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
627 | g_free(crt); |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
628 | } |
|
fa009823dbfd
- Exposed the _Certificate struct definition in certificate.h
William Ehlhardt <williamehlhardt@gmail.com>
parents:
17507
diff
changeset
|
629 | |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
630 | /** Determines whether one certificate has been issued and signed by another |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
631 | * |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
632 | * @param crt Certificate to check the signature of |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
633 | * @param issuer Issuer's certificate |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
634 | * |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
635 | * @return TRUE if crt was signed and issued by issuer, otherwise FALSE |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
636 | * @TODO Modify this function to return a reason for invalidity? |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
637 | */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
638 | static gboolean |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
639 | x509_certificate_signed_by(PurpleCertificate * crt, |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
640 | PurpleCertificate * issuer) |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
641 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
642 | gnutls_x509_crt crt_dat; |
|
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
643 | gnutls_x509_crt issuer_dat; |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
644 | unsigned int verify; /* used to store result from GnuTLS verifier */ |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
645 | int ret; |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
646 | |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
647 | g_return_val_if_fail(crt, FALSE); |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
648 | g_return_val_if_fail(issuer, FALSE); |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
649 | |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
650 | /* Verify that both certs are the correct scheme */ |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
651 | g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE); |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
652 | g_return_val_if_fail(issuer->scheme == &x509_gnutls, FALSE); |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
653 | |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
654 | /* TODO: check for more nullness? */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
655 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
656 | crt_dat = X509_GET_GNUTLS_DATA(crt); |
|
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
657 | issuer_dat = X509_GET_GNUTLS_DATA(issuer); |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
658 | |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
659 | /* First, let's check that crt.issuer is actually issuer */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
660 | ret = gnutls_x509_crt_check_issuer(crt_dat, issuer_dat); |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
661 | if (ret <= 0) { |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
662 | |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
663 | if (ret < 0) { |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
664 | purple_debug_error("gnutls/x509", |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
665 | "GnuTLS error %d while checking certificate issuer match.", |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
666 | ret); |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
667 | } else { |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
668 | gchar *crt_id, *issuer_id, *crt_issuer_id; |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
669 | crt_id = purple_certificate_get_unique_id(crt); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
670 | issuer_id = purple_certificate_get_unique_id(issuer); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
671 | crt_issuer_id = |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
672 | purple_certificate_get_issuer_unique_id(crt); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
673 | purple_debug_info("gnutls/x509", |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
674 | "Certificate for %s claims to be " |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
675 | "issued by %s, but the certificate " |
|
20176
5d7a12420da4
applied changes from 54b7bcca130674c9f93777772bdf3d08237a7951
Richard Laager <rlaager@pidgin.im>
parents:
20175
diff
changeset
|
676 | "for %s does not match.\n", |
|
5d7a12420da4
applied changes from 54b7bcca130674c9f93777772bdf3d08237a7951
Richard Laager <rlaager@pidgin.im>
parents:
20175
diff
changeset
|
677 | crt_id, crt_issuer_id, issuer_id); |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
678 | g_free(crt_id); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
679 | g_free(issuer_id); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
680 | g_free(crt_issuer_id); |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
681 | } |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
682 | |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
683 | /* The issuer is not correct, or there were errors */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
684 | return FALSE; |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
685 | } |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
686 | |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
687 | /* Now, check the signature */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
688 | /* The second argument is a ptr to an array of "trusted" issuer certs, |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
689 | but we're only using one trusted one */ |
|
19359
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
690 | ret = gnutls_x509_crt_verify(crt_dat, &issuer_dat, 1, |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
691 | /* Permit signings by X.509v1 certs |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
692 | (Verisign and possibly others have |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
693 | root certificates that predate the |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
694 | current standard) */ |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
695 | GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT, |
|
8961d49b1b87
- x509_signed_by now accepts a signature by an X.509 version 1
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19356
diff
changeset
|
696 | &verify); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
697 | |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
698 | if (ret != 0) { |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
699 | purple_debug_error("gnutls/x509", |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
700 | "Attempted certificate verification caused a GnuTLS error code %d. I will just say the signature is bad, but you should look into this.\n", ret); |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
701 | return FALSE; |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
702 | } |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
703 | |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
704 | if (verify & GNUTLS_CERT_INVALID) { |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
705 | /* Signature didn't check out, but at least |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
706 | there were no errors*/ |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
707 | gchar *crt_id = purple_certificate_get_unique_id(crt); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
708 | gchar *issuer_id = purple_certificate_get_issuer_unique_id(crt); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
709 | purple_debug_info("gnutls/x509", |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
710 | "Bad signature for %s on %s\n", |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
711 | issuer_id, crt_id); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
712 | g_free(crt_id); |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
713 | g_free(issuer_id); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
714 | |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
715 | return FALSE; |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
716 | } /* if (ret, etc.) */ |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
717 | |
|
19353
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
718 | /* If we got here, the signature is good */ |
|
bf6a0230d8e7
- Fix x509_signed_by. Apparently I can't read documentation.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19019
diff
changeset
|
719 | return TRUE; |
|
18250
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
720 | } |
|
d7663374e33d
- Add x509_certificate_signed_by, which checks a signature on a certificate made by an issuer
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18248
diff
changeset
|
721 | |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
722 | static GByteArray * |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
723 | x509_sha1sum(PurpleCertificate *crt) |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
724 | { |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
725 | size_t hashlen = 20; /* SHA1 hashes are 20 bytes */ |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
726 | size_t tmpsz = hashlen; /* Throw-away variable for GnuTLS to stomp on*/ |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
727 | gnutls_x509_crt crt_dat; |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
728 | GByteArray *hash; /**< Final hash container */ |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
729 | guchar hashbuf[hashlen]; /**< Temporary buffer to contain hash */ |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
730 | |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
731 | g_return_val_if_fail(crt, NULL); |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
732 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
733 | crt_dat = X509_GET_GNUTLS_DATA(crt); |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
734 | |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
735 | /* Extract the fingerprint */ |
|
19495
af7b321844ab
- More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19494
diff
changeset
|
736 | g_return_val_if_fail( |
|
af7b321844ab
- More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19494
diff
changeset
|
737 | 0 == gnutls_x509_crt_get_fingerprint(crt_dat, GNUTLS_MAC_SHA, |
|
af7b321844ab
- More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19494
diff
changeset
|
738 | hashbuf, &tmpsz), |
|
af7b321844ab
- More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19494
diff
changeset
|
739 | NULL); |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
740 | |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
741 | /* This shouldn't happen */ |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
742 | g_return_val_if_fail(tmpsz == hashlen, NULL); |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
743 | |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
744 | /* Okay, now create and fill hash array */ |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
745 | hash = g_byte_array_new(); |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
746 | g_byte_array_append(hash, hashbuf, hashlen); |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
747 | |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
748 | return hash; |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
749 | } |
|
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
750 | |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
751 | static gchar * |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
752 | x509_cert_dn (PurpleCertificate *crt) |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
753 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
754 | gnutls_x509_crt cert_dat; |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
755 | gchar *dn = NULL; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
756 | size_t dn_size; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
757 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
758 | g_return_val_if_fail(crt, NULL); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
759 | g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
760 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
761 | cert_dat = X509_GET_GNUTLS_DATA(crt); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
762 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
763 | /* Figure out the length of the Distinguished Name */ |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
764 | /* Claim that the buffer is size 0 so GnuTLS just tells us how much |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
765 | space it needs */ |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
766 | dn_size = 0; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
767 | gnutls_x509_crt_get_dn(cert_dat, dn, &dn_size); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
768 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
769 | /* Now allocate and get the Distinguished Name */ |
|
20175
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
770 | /* Old versions of GnuTLS have an off-by-one error in reporting |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
771 | the size of the needed buffer in some functions, so allocate |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
772 | an extra byte */ |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
773 | dn = g_new0(gchar, ++dn_size); |
|
19496
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
774 | if (0 != gnutls_x509_crt_get_dn(cert_dat, dn, &dn_size)) { |
|
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
775 | purple_debug_error("gnutls/x509", |
|
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
776 | "Failed to get Distinguished Name\n"); |
|
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
777 | g_free(dn); |
|
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
778 | return NULL; |
|
648d59dc3bfa
- Errorchecking in x509_cert_dn
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19495
diff
changeset
|
779 | } |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
780 | |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
781 | return dn; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
782 | } |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
783 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
784 | static gchar * |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
785 | x509_issuer_dn (PurpleCertificate *crt) |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
786 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
787 | gnutls_x509_crt cert_dat; |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
788 | gchar *dn = NULL; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
789 | size_t dn_size; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
790 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
791 | g_return_val_if_fail(crt, NULL); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
792 | g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
793 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
794 | cert_dat = X509_GET_GNUTLS_DATA(crt); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
795 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
796 | /* Figure out the length of the Distinguished Name */ |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
797 | /* Claim that the buffer is size 0 so GnuTLS just tells us how much |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
798 | space it needs */ |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
799 | dn_size = 0; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
800 | gnutls_x509_crt_get_issuer_dn(cert_dat, dn, &dn_size); |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
801 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
802 | /* Now allocate and get the Distinguished Name */ |
|
20175
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
803 | /* Old versions of GnuTLS have an off-by-one error in reporting |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
804 | the size of the needed buffer in some functions, so allocate |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
805 | an extra byte */ |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
806 | dn = g_new0(gchar, ++dn_size); |
|
19497
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
807 | if (0 != gnutls_x509_crt_get_issuer_dn(cert_dat, dn, &dn_size)) { |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
808 | purple_debug_error("gnutls/x509", |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
809 | "Failed to get issuer's Distinguished " |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
810 | "Name\n"); |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
811 | g_free(dn); |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
812 | return NULL; |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
813 | } |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
814 | |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
815 | return dn; |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
816 | } |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
817 | |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
818 | static gchar * |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
819 | x509_common_name (PurpleCertificate *crt) |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
820 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
821 | gnutls_x509_crt cert_dat; |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
822 | gchar *cn = NULL; |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
823 | size_t cn_size; |
|
19497
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
824 | int ret; |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
825 | |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
826 | g_return_val_if_fail(crt, NULL); |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
827 | g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL); |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
828 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
829 | cert_dat = X509_GET_GNUTLS_DATA(crt); |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
830 | |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
831 | /* Figure out the length of the Common Name */ |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
832 | /* Claim that the buffer is size 0 so GnuTLS just tells us how much |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
833 | space it needs */ |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
834 | cn_size = 0; |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
835 | gnutls_x509_crt_get_dn_by_oid(cert_dat, |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
836 | GNUTLS_OID_X520_COMMON_NAME, |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
837 | 0, /* First CN found, please */ |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
838 | 0, /* Not in raw mode */ |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
839 | cn, &cn_size); |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
840 | |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
841 | /* Now allocate and get the Common Name */ |
|
20175
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
842 | /* Old versions of GnuTLS have an off-by-one error in reporting |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
843 | the size of the needed buffer in some functions, so allocate |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
844 | an extra byte */ |
|
0785c8f62a58
applied changes from 38a516984dfbc8fb0def05acb69fc1180ec0b971
Richard Laager <rlaager@pidgin.im>
parents:
20174
diff
changeset
|
845 | cn = g_new0(gchar, ++cn_size); |
|
19497
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
846 | ret = gnutls_x509_crt_get_dn_by_oid(cert_dat, |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
847 | GNUTLS_OID_X520_COMMON_NAME, |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
848 | 0, /* First CN found, please */ |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
849 | 0, /* Not in raw mode */ |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
850 | cn, &cn_size); |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
851 | if (ret != 0) { |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
852 | purple_debug_error("gnutls/x509", |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
853 | "Failed to get Common Name\n"); |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
854 | g_free(cn); |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
855 | return NULL; |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
856 | } |
|
9766bb35cc02
- Yet More TODO whacking
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19496
diff
changeset
|
857 | |
|
18482
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
858 | return cn; |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
859 | } |
|
be73de06d821
- Add subject_name (AKA Common Name) functions to GnuTLS x509 scheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18480
diff
changeset
|
860 | |
|
18643
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
861 | static gboolean |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
862 | x509_check_name (PurpleCertificate *crt, const gchar *name) |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
863 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
864 | gnutls_x509_crt crt_dat; |
|
18643
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
865 | |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
866 | g_return_val_if_fail(crt, FALSE); |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
867 | g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE); |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
868 | g_return_val_if_fail(name, FALSE); |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
869 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
870 | crt_dat = X509_GET_GNUTLS_DATA(crt); |
|
18643
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
871 | |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
872 | if (gnutls_x509_crt_check_hostname(crt_dat, name)) { |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
873 | return TRUE; |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
874 | } else { |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
875 | return FALSE; |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
876 | } |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
877 | } |
|
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
878 | |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
879 | static gboolean |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
880 | x509_times (PurpleCertificate *crt, time_t *activation, time_t *expiration) |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
881 | { |
|
20174
dc85e2b0d3da
applied changes from 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e
Richard Laager <rlaager@pidgin.im>
parents:
20151
diff
changeset
|
882 | gnutls_x509_crt crt_dat; |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
883 | /* GnuTLS time functions return this on error */ |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
884 | const time_t errval = (time_t) (-1); |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
885 | |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
886 | |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
887 | g_return_val_if_fail(crt, FALSE); |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
888 | g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE); |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
889 | |
|
18652
0998769e4fea
- GnuTLS plugin now uses reference counting to manage its underlying
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18648
diff
changeset
|
890 | crt_dat = X509_GET_GNUTLS_DATA(crt); |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
891 | |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
892 | if (activation) { |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
893 | *activation = gnutls_x509_crt_get_activation_time(crt_dat); |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
894 | } |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
895 | if (expiration) { |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
896 | *expiration = gnutls_x509_crt_get_expiration_time(crt_dat); |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
897 | } |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
898 | |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
899 | if (*activation == errval || *expiration == errval) { |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
900 | return FALSE; |
|
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
901 | } |
|
19712
658159391efc
Get rid of some stray whitespace and consistently use tab indentation
Mark Doliner <markdoliner@pidgin.im>
parents:
19711
diff
changeset
|
902 | |
|
19007
f3c3ddf37812
- Change the internal structure of activation/expiration times to match
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18656
diff
changeset
|
903 | return TRUE; |
|
18648
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
904 | } |
|
a677b7c8fd97
- Add activation/expiration time retrievers to GnuTLS plugin
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18643
diff
changeset
|
905 | |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
906 | /* X.509 certificate operations provided by this plugin */ |
|
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
907 | static PurpleCertificateScheme x509_gnutls = { |
|
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
908 | "x509", /* Scheme name */ |
|
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
909 | N_("X.509 Certificates"), /* User-visible scheme name */ |
|
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
910 | x509_import_from_file, /* Certificate import function */ |
|
18496
3bb8e716482e
- Add purple_certificate_export and associated libpurple stuff
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18482
diff
changeset
|
911 | x509_export_certificate, /* Certificate export function */ |
|
18654
45790c3e780d
- Add GnuTLS X.509 cert copy operator
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18653
diff
changeset
|
912 | x509_copy_certificate, /* Copy */ |
|
18454
9a56a88152b9
- Add more to the Certificate struct
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18450
diff
changeset
|
913 | x509_destroy_certificate, /* Destroy cert */ |
|
19016
3cf632c31eb3
- Add purple_certificate_signed_by
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19007
diff
changeset
|
914 | x509_certificate_signed_by, /* Signature checker */ |
|
18455
4fe7da78f38d
- Add GnuTLS SHA1 key fingerprinter
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18454
diff
changeset
|
915 | x509_sha1sum, /* SHA1 fingerprint */ |
|
19019
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
916 | x509_cert_dn, /* Unique ID */ |
|
d2415aad4cfb
- Add unique_id and issuer_unique_id constructions (defined as Distinguished
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19016
diff
changeset
|
917 | x509_issuer_dn, /* Issuer Unique ID */ |
|
18641
4b3c12392054
- Add get_activation_time and get_expiration_time to CertificateScheme
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18593
diff
changeset
|
918 | x509_common_name, /* Subject name */ |
|
18643
a6a86ac3c219
- Add certificate_check_subject_name and associated machinery
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18642
diff
changeset
|
919 | x509_check_name, /* Check subject name */ |
|
19827
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
920 | x509_times, /* Activation/Expiration time */ |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
921 | |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
922 | NULL, |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
923 | NULL, |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
924 | NULL, |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
925 | NULL |
|
62c3805f723e
- Add purple_reserved fields to various structures.
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19714
diff
changeset
|
926 | |
|
18248
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
927 | }; |
|
8f462eaffecd
- Style issues
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18247
diff
changeset
|
928 | |
| 15884 | 929 | static PurpleSslOps ssl_ops = |
| 7016 | 930 | { |
| 931 | ssl_gnutls_init, | |
| 932 | ssl_gnutls_uninit, | |
|
14223
c6ba4f3482de
[gaim-migrate @ 16809]
Mark Doliner <markdoliner@pidgin.im>
parents:
13985
diff
changeset
|
933 | ssl_gnutls_connect, |
| 7016 | 934 | ssl_gnutls_close, |
| 935 | ssl_gnutls_read, | |
|
16744
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
936 | ssl_gnutls_write, |
|
18246
212bfb9c9cc7
- Expose get_peer_certificates in the SslOps struct, and modify gnutls
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18245
diff
changeset
|
937 | ssl_gnutls_get_peer_certificates, |
|
16744
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
938 | |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
939 | /* padding */ |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
940 | NULL, |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
941 | NULL, |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
942 | NULL |
| 7016 | 943 | }; |
| 944 | ||
| 945 | #endif /* HAVE_GNUTLS */ | |
| 946 | ||
| 947 | static gboolean | |
| 15884 | 948 | plugin_load(PurplePlugin *plugin) |
| 7016 | 949 | { |
| 950 | #ifdef HAVE_GNUTLS | |
| 15884 | 951 | if(!purple_ssl_get_ops()) { |
| 952 | purple_ssl_set_ops(&ssl_ops); | |
|
7862
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
953 | } |
| 7016 | 954 | |
| 11033 | 955 | /* Init GNUTLS now so others can use it even if sslconn never does */ |
| 956 | ssl_gnutls_init_gnutls(); | |
| 957 | ||
|
19356
65dacaaad968
- Move ssl-gnutls x509 registration until after GnuTLS itself is inited
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19353
diff
changeset
|
958 | /* Register that we're providing an X.509 CertScheme */ |
|
65dacaaad968
- Move ssl-gnutls x509 registration until after GnuTLS itself is inited
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19353
diff
changeset
|
959 | purple_certificate_register_scheme( &x509_gnutls ); |
|
65dacaaad968
- Move ssl-gnutls x509 registration until after GnuTLS itself is inited
William Ehlhardt <williamehlhardt@gmail.com>
parents:
19353
diff
changeset
|
960 | |
| 7016 | 961 | return TRUE; |
| 962 | #else | |
| 963 | return FALSE; | |
| 964 | #endif | |
| 965 | } | |
| 966 | ||
| 967 | static gboolean | |
| 15884 | 968 | plugin_unload(PurplePlugin *plugin) |
| 7016 | 969 | { |
|
7050
12730863b0f9
[gaim-migrate @ 7613]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
970 | #ifdef HAVE_GNUTLS |
| 15884 | 971 | if(purple_ssl_get_ops() == &ssl_ops) { |
| 972 | purple_ssl_set_ops(NULL); | |
|
7862
9b96706e44e7
[gaim-migrate @ 8516]
Bill Tompkins <obobo@users.sourceforge.net>
parents:
7834
diff
changeset
|
973 | } |
|
18447
27554a183269
- GnuTLS plugin registers an x509 certscheme now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18250
diff
changeset
|
974 | |
|
27554a183269
- GnuTLS plugin registers an x509 certscheme now
William Ehlhardt <williamehlhardt@gmail.com>
parents:
18250
diff
changeset
|
975 | purple_certificate_unregister_scheme( &x509_gnutls ); |
|
7050
12730863b0f9
[gaim-migrate @ 7613]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
976 | #endif |
|
12730863b0f9
[gaim-migrate @ 7613]
Christian Hammond <chipx86@chipx86.com>
parents:
7016
diff
changeset
|
977 | |
| 7016 | 978 | return TRUE; |
| 979 | } | |
| 980 | ||
| 15884 | 981 | static PurplePluginInfo info = |
| 7016 | 982 | { |
| 15884 | 983 | PURPLE_PLUGIN_MAGIC, |
| 984 | PURPLE_MAJOR_VERSION, | |
| 985 | PURPLE_MINOR_VERSION, | |
| 986 | PURPLE_PLUGIN_STANDARD, /**< type */ | |
| 7016 | 987 | NULL, /**< ui_requirement */ |
| 15884 | 988 | PURPLE_PLUGIN_FLAG_INVISIBLE, /**< flags */ |
| 7016 | 989 | NULL, /**< dependencies */ |
| 15884 | 990 | PURPLE_PRIORITY_DEFAULT, /**< priority */ |
| 7016 | 991 | |
| 992 | SSL_GNUTLS_PLUGIN_ID, /**< id */ | |
| 993 | N_("GNUTLS"), /**< name */ | |
| 994 | VERSION, /**< version */ | |
| 995 | /** summary */ | |
| 996 | N_("Provides SSL support through GNUTLS."), | |
| 997 | /** description */ | |
| 998 | N_("Provides SSL support through GNUTLS."), | |
| 999 | "Christian Hammond <chipx86@gnupdate.org>", | |
| 15884 | 1000 | PURPLE_WEBSITE, /**< homepage */ |
| 7016 | 1001 | |
| 1002 | plugin_load, /**< load */ | |
| 1003 | plugin_unload, /**< unload */ | |
| 1004 | NULL, /**< destroy */ | |
| 1005 | ||
| 1006 | NULL, /**< ui_info */ | |
|
11513
89bf8d856291
[gaim-migrate @ 13758]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11256
diff
changeset
|
1007 | NULL, /**< extra_info */ |
|
89bf8d856291
[gaim-migrate @ 13758]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11256
diff
changeset
|
1008 | NULL, /**< prefs_info */ |
|
16744
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1009 | NULL, /**< actions */ |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1010 | |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1011 | /* padding */ |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1012 | NULL, |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1013 | NULL, |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1014 | NULL, |
|
fcdab37ba1c2
Added NULL pads to ssl stuff
Gary Kramlich <grim@reaperworld.com>
parents:
15884
diff
changeset
|
1015 | NULL |
| 7016 | 1016 | }; |
| 1017 | ||
| 1018 | static void | |
| 15884 | 1019 | init_plugin(PurplePlugin *plugin) |
| 7016 | 1020 | { |
| 1021 | } | |
| 1022 | ||
| 15884 | 1023 | PURPLE_INIT_PLUGIN(ssl_gnutls, init_plugin, info) |