# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1065332144 0
# Node ID fae7cfe975fdc3b13622cbca5f6c3605cb584453
# Parent  bb484e976aa81604511ab5195cc6e2816ba091f9
[gaim-migrate @ 7724]
fix the NSS SSL plugin for TLS upgrades, and make note when a jabber server
requires TLS upgrading.  How many more acronyms can I fit in this commit
message?

committer: Tailor Script <tailor@pidgin.im>

diff -r bb484e976aa8 -r fae7cfe975fd plugins/ssl/ssl-nss.c
--- a/plugins/ssl/ssl-nss.c	Sun Oct 05 05:04:55 2003 +0000
+++ b/plugins/ssl/ssl-nss.c	Sun Oct 05 05:35:44 2003 +0000
@@ -195,7 +195,8 @@
 							(void *)CERT_GetDefaultCertDB());
 	SSL_BadCertHook(nss_data->in, (SSLBadCertHandler)ssl_bad_cert, NULL);
 
-	SSL_SetURL(nss_data->in, gsc->host);
+	if(gsc->host)
+		SSL_SetURL(nss_data->in, gsc->host);
 
 	SSL_ResetHandshake(nss_data->in, PR_FALSE);
 
diff -r bb484e976aa8 -r fae7cfe975fd src/protocols/jabber/auth.c
--- a/src/protocols/jabber/auth.c	Sun Oct 05 05:04:55 2003 +0000
+++ b/src/protocols/jabber/auth.c	Sun Oct 05 05:35:44 2003 +0000
@@ -41,11 +41,15 @@
 
 	gboolean digest_md5 = FALSE;
 
-	if(gaim_ssl_is_supported() &&
-			(starttls = xmlnode_get_child(packet, "starttls"))) {
-		jabber_send_raw(js,
-				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-		return;
+	if((starttls = xmlnode_get_child(packet, "starttls"))) {
+		if(gaim_ssl_is_supported()) {
+			jabber_send_raw(js,
+					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+			return;
+		} else if(xmlnode_get_child(starttls, "required")) {
+			gaim_connection_error(js->gc, _("Server requires SSL for login"));
+			return;
+		}
 	}
 
 	mechs = xmlnode_get_child(packet, "mechanisms");