pidgin.2.6.5: d24cb477: *** Plucked rev 8549b9a30115559965e9bf93...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: d24cb477161e5fc2e4f37aa757f268d5dcc7cd34
Ancestor: 7107d360f4e1e6e9915e9f9c7e84d5ede15837e3
Author: datallah at pidgin.im
Date: 2010-01-07T23:46:24
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/d24cb477161e5fc2e4f37aa757f268d5dcc7cd34

Modified files:
        ChangeLog libpurple/certificate.c

ChangeLog: 

*** Plucked rev 8549b9a30115559965e9bf93bb15a45b04c1d149 (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
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	127e45f921be4d485dc7a77e4754f4c9057db3e8
+++ ChangeLog	4a8b4dabcbae64dee5d9c28f88445f79e51b976b
@@ -2,6 +2,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");
 		}