pidgin: 8549b9a3: certs: Cache certs once again (at the en...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8549b9a30115559965e9bf93bb15a45b04c1d149
Ancestor: 29b79286f5f28b0f259430f59b8da76617d26e2d
Author: darkrain42 at pidgin.im
Date: 2009-12-15T16:06:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8549b9a30115559965e9bf93bb15a45b04c1d149

Modified files:
        ChangeLog libpurple/certificate.c

ChangeLog: 

certs: Cache certs once again (at the end of the verification process).

It looks like I accidentally broke this (libpurple wouldn't replace a cert
already in the cache) when extending the invalidity reasons.

-------------- next part --------------
============================================================
--- ChangeLog	81efda351c6899d71ad776fd6a2dbb3caa5ff1ee
+++ ChangeLog	8e542ff49902b49eac5732be4cf64294b573d3ae
@@ -1,6 +1,10 @@ version 2.6.5 (??/??/20??):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.6.5 (??/??/20??):
+	libpurple:
+	* TLS certificates are actually stored to the local cache once again
+	  (accepting a name mismatch on a certificate should now be remembered)
+
 	General:
 	* Build-time fixes for Solaris.  (Paul Townsend)
 
============================================================
--- libpurple/certificate.c	1d1f871a2b65bdf7f9b8541ebb0b772cf6b8fdb5
+++ libpurple/certificate.c	e273a4b3baf8eaa11fc301f0de56722236698daf
@@ -1431,9 +1431,8 @@ x509_tls_cached_complete(PurpleCertifica
 	tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,
 						 "tls_peers");
 	if (tls_peers) {
-		if (!purple_certificate_pool_contains(tls_peers, vrq->subject_name) &&
-		        !purple_certificate_pool_store(tls_peers,vrq->subject_name,
-		                                       peer_crt)) {
+		if (!purple_certificate_pool_store(tls_peers,vrq->subject_name,
+		                                   peer_crt)) {
 			purple_debug_error("certificate/x509/tls_cached",
 			                   "FAILED to cache peer certificate\n");
 		}