Mercurial > pidgin

comparison libpurple/plugins/ssl/ssl-gnutls.c @ 17782:53bd10a83322

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Eliminate some warnings
author William Ehlhardt <williamehlhardt@gmail.com>
date Tue, 29 May 2007 21:00:08 +0000
parents e0eb1eb5b47b
children 15550eab4e27 c5913175c5d2
comparison
equal deleted inserted replaced
17780:e0eb1eb5b47b 17782:53bd10a83322
135 g_free(primary); 135 g_free(primary);
136 } 136 }
137 else 137 else
138 { 138 {
139 /* Grab the first certificate and display some data about it */ 139 /* Grab the first certificate and display some data about it */
140 gchar fpr_bin[256]; /* Raw binary key fingerprint */ 140 guchar fpr_bin[256]; /* Raw binary key fingerprint */
141 gsize fpr_bin_sz = sizeof(fpr_bin); /* Size of above (used later) */ 141 gsize fpr_bin_sz = sizeof(fpr_bin); /* Size of above (used later) */
142 gchar * fpr_asc = NULL; /* ASCII representation of key fingerprint */ 142 gchar * fpr_asc = NULL; /* ASCII representation of key fingerprint */
143 gchar ser_bin[256]; /* Certificate Serial Number field */ 143 guchar ser_bin[256]; /* Certificate Serial Number field */
144 gsize ser_bin_sz = sizeof(ser_bin); 144 gsize ser_bin_sz = sizeof(ser_bin);
145 gchar * ser_asc = NULL; 145 gchar * ser_asc = NULL;
146 gchar dn[1024]; /* Certificate Name field */ 146 gchar dn[1024]; /* Certificate Name field */
147 gsize dn_sz = sizeof(dn); 147 gsize dn_sz = sizeof(dn);
148 /* TODO: Analyze certificate time/date stuff */ 148 /* TODO: Analyze certificate time/date stuff */
213 ssl_gnutls_authcheck_cb /* Cancel */ 213 ssl_gnutls_authcheck_cb /* Cancel */
214 ); 214 );
215 215
216 g_free(primary); 216 g_free(primary);
217 g_free(secondary); 217 g_free(secondary);
218 } 218 } /* End dialog construction */
219 219
220 220
221 /* Cleanup! */ 221 /* Cleanup! */
222 g_free(fpr_asc); 222 g_free(fpr_asc);
223 g_free(ser_asc); 223 g_free(ser_asc);
224 224
225 gnutls_x509_crt_deinit(cert); 225 gnutls_x509_crt_deinit(cert);
226 } 226 } /* if (0 == ... */
227 } 227 }
228 228
229 static void ssl_gnutls_handshake_cb(gpointer data, gint source, 229 static void ssl_gnutls_handshake_cb(gpointer data, gint source,
230 PurpleInputCondition cond) 230 PurpleInputCondition cond)
231 { 231 {
257 /* Spit some key info to debug */ 257 /* Spit some key info to debug */
258 { 258 {
259 const gnutls_datum_t *cert_list; 259 const gnutls_datum_t *cert_list;
260 unsigned int cert_list_size = 0; 260 unsigned int cert_list_size = 0;
261 gnutls_session_t session=gnutls_data->session; 261 gnutls_session_t session=gnutls_data->session;
262 int i;
262 263
263 cert_list = 264 cert_list =
264 gnutls_certificate_get_peers(session, &cert_list_size); 265 gnutls_certificate_get_peers(session, &cert_list_size);
265 266
266 purple_debug_info("gnutls", 267 purple_debug_info("gnutls",
267 "Peer provided %d certs\n", 268 "Peer provided %d certs\n",
268 cert_list_size); 269 cert_list_size);
269 int i; 270
270 for (i=0; i<cert_list_size; i++) 271 for (i=0; i<cert_list_size; i++)
271 { 272 {
272 gchar fpr_bin[256]; 273 guchar fpr_bin[256];
273 gsize fpr_bin_sz = sizeof(fpr_bin); 274 gsize fpr_bin_sz = sizeof(fpr_bin);
274 gchar * fpr_asc = NULL; 275 gchar * fpr_asc = NULL;
275 gchar tbuf[256]; 276 guchar tbuf[256];
276 gsize tsz=sizeof(tbuf); 277 gsize tsz=sizeof(tbuf);
277 gchar * tasc = NULL; 278 gchar * tasc = NULL;
278 gnutls_x509_crt_t cert; 279 gnutls_x509_crt_t cert;
280 int ret;
279 281
280 gnutls_x509_crt_init(&cert); 282 gnutls_x509_crt_init(&cert);
281 gnutls_x509_crt_import (cert, &cert_list[i], 283 gnutls_x509_crt_import (cert, &cert_list[i],
282 GNUTLS_X509_FMT_DER); 284 GNUTLS_X509_FMT_DER);
283 285
290 purple_debug_info("gnutls", 292 purple_debug_info("gnutls",
291 "Lvl %d SHA1 fingerprint: %s\n", 293 "Lvl %d SHA1 fingerprint: %s\n",
292 i, fpr_asc); 294 i, fpr_asc);
293 295
294 tsz=sizeof(tbuf); 296 tsz=sizeof(tbuf);
295 int ret = gnutls_x509_crt_get_serial(cert,tbuf,&tsz); 297 gnutls_x509_crt_get_serial(cert,tbuf,&tsz);
296 tasc= 298 tasc=
297 purple_base16_encode_chunked(tbuf, tsz); 299 purple_base16_encode_chunked(tbuf, tsz);
298 purple_debug_info("gnutls", 300 purple_debug_info("gnutls",
299 "Serial: %s(%d bytes, ret=%d)\n", 301 "Serial: %s(%d bytes, ret=%d)\n",
300 tasc, tsz, ret); 302 tasc, tsz, ret);