cpw.ljfisher.ssl_client_auth: 086a90dd: Replaced the ssl connect calls with our ...

[lucas.fisher at gmail.com]

----------------------------------------------------------------------
Revision: 086a90dd9225c84e8b8f86b5fc22aa8857ee1d05
Parent:   eae8c20ad58748e5289d6d69b76651de35147557
Author:   lucas.fisher at gmail.com
Date:     04/16/11 17:01:03
Branch:   im.pidgin.cpw.ljfisher.ssl_client_auth
URL: http://d.pidgin.im/viewmtn/revision/info/086a90dd9225c84e8b8f86b5fc22aa8857ee1d05

Changelog: 

Replaced the ssl connect calls with our now ssl connect calls that take the id of a certificate to use for authentication.

Changes against parent eae8c20ad58748e5289d6d69b76651de35147557

  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	7140ac4d990310cc716507d05d29c1cc413712c2
+++ libpurple/protocols/jabber/jabber.c	502edd564948c65d85032a4af668c89608e12c23
@@ -851,8 +851,9 @@ static void tls_init(JabberStream *js)
 {
 	purple_input_remove(js->gc->inpa);
 	js->gc->inpa = 0;
-	js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
-			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc);
+	js->gsc = purple_ssl_connect_with_host_fd_auth(js->gc->account, js->fd,
+			jabber_login_callback_ssl, jabber_ssl_connect_failure, 
+			js->certificate_CN, js->gc->account->certificate_id, js->gc);
 	/* The fd is no longer our concern */
 	js->fd = -1;
 }
@@ -1049,9 +1050,10 @@ jabber_stream_connect(JabberStream *js)
 	/* if they've got old-ssl mode going, we probably want to ignore SRV lookups */
 	if (g_str_equal("old_ssl", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		if(purple_ssl_is_supported()) {
-			js->gsc = purple_ssl_connect(account, js->certificate_CN,
+			js->gsc = purple_ssl_connect_with_ssl_cn_auth(account, js->certificate_CN,
 					purple_account_get_int(account, "port", 5223),
-					jabber_login_callback_ssl, jabber_ssl_connect_failure, gc);
+					jabber_login_callback_ssl, jabber_ssl_connect_failure,
+					NULL, account->certificate_id, gc);
 			if (!js->gsc) {
 				purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,