Mercurial > pidgin.yaz
comparison libpurple/certificate.c @ 24838:0d7c21b5f1d7
propagate from branch 'im.pidgin.pidgin' (head c06356e8e8d2c586f0192a5564053c2584020da8)
to branch 'im.pidgin.pidgin.openq' (head a7077bc12b850d60ea7d768f4b9d4ee6ae6ad2c1)
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Thu, 25 Dec 2008 14:06:10 +0000 |
parents | 7608cf033a88 |
children | fc8fd4fef166 a6e3cb32cdd2 421857b25052 |
comparison
equal
deleted
inserted
replaced
24606:68eba2bafa6f | 24838:0d7c21b5f1d7 |
---|---|
746 "ca-certs", NULL)); | 746 "ca-certs", NULL)); |
747 #else | 747 #else |
748 # ifdef SSL_CERTIFICATES_DIR | 748 # ifdef SSL_CERTIFICATES_DIR |
749 x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR)); | 749 x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR)); |
750 # else | 750 # else |
751 x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR, | |
752 "purple", "ca-certs", NULL)); | |
753 # endif | 751 # endif |
752 x509_ca_paths = g_list_append(x509_ca_paths, | |
753 g_build_filename(DATADIR, "purple", "ca-certs", NULL)); | |
754 #endif | 754 #endif |
755 } | 755 } |
756 | 756 |
757 /* Attempt to initialize now, but if it doesn't work, that's OK; | 757 /* Attempt to initialize now, but if it doesn't work, that's OK; |
758 it will get done later */ | 758 it will get done later */ |
1257 "Lookup failed on cached certificate!\n" | 1257 "Lookup failed on cached certificate!\n" |
1258 "It was here just a second ago. Forwarding " | 1258 "It was here just a second ago. Forwarding " |
1259 "to cert_changed.\n"); | 1259 "to cert_changed.\n"); |
1260 /* vrq now becomes the problem of cert_changed */ | 1260 /* vrq now becomes the problem of cert_changed */ |
1261 x509_tls_cached_peer_cert_changed(vrq); | 1261 x509_tls_cached_peer_cert_changed(vrq); |
1262 return; | |
1262 } | 1263 } |
1263 | 1264 |
1264 /* Now get SHA1 sums for both and compare them */ | 1265 /* Now get SHA1 sums for both and compare them */ |
1265 /* TODO: This is not an elegant way to compare certs */ | 1266 /* TODO: This is not an elegant way to compare certs */ |
1266 peer_fpr = purple_certificate_get_fingerprint_sha1(peer_crt); | 1267 peer_fpr = purple_certificate_get_fingerprint_sha1(peer_crt); |