From: Michael Lamb <mlamb1976@yahoo.com>
Date: Mon, 24 Mar 2014 17:48:58 +0000 (-0700)
Subject: Adium: BEAST mitigations for 10.8.5
X-Git-Tag: 1.18.1~11
X-Git-Url: https://repo.or.cz/w/siplcs.git/commitdiff_plain/b5cec74420ac0ce2475a14d53c2db27743871c15

Adium: BEAST mitigations for 10.8.5

Fixed BEAST mitigations for 10.8.5 hosts (trac.adium.im bugs #16550/#16611)
Fixed network reachability issue (not reported) due to localhost *always* being available
---

diff --git a/src/adium/ESPurpleSIPEAccount.m b/src/adium/ESPurpleSIPEAccount.m
index 9e602f73..b1628faa 100644
--- a/src/adium/ESPurpleSIPEAccount.m
+++ b/src/adium/ESPurpleSIPEAccount.m
@@ -124,7 +124,9 @@
         if ([value isKindOfClass:[NSString class]]) {
             if ([key isEqualToString:KEY_SIPE_CONNECT_HOST]) {
                 if ([value isEqualToString:@""]) {
-                    [self setPreference:@"localhost" forKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS];
+                    // An empty sipe_connect_host means we're autodetecting the server
+                    // So we set this to our own hostname, so that the reachability test has a *network* address (i.e. non-loopback) to check connectivity against.
+                    [self setPreference:[[NSHost currentHost] localizedName] forKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS];
                 } else {
                     // If the user entered server:port only give the server portion to adium
                     // otherwise the DNS lookup will fail the reachability test
diff --git a/src/adium/ESSIPEAccountViewController.m b/src/adium/ESSIPEAccountViewController.m
index 57fe39bb..b6f4fbd9 100644
--- a/src/adium/ESSIPEAccountViewController.m
+++ b/src/adium/ESSIPEAccountViewController.m
@@ -61,9 +61,9 @@
 {
     [super configureForAccount:inAccount];
 
-    // BEAST mitigation for Mavericks users
-    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_8) {
-        // We are not running on Mavericks - Don't display BEAST mitigation configuration option
+    // BEAST mitigation for Mavericks and 10.8.5 users (with Security Update 2014-001)
+    if (NSAppKitVersionNumber < NSAppKitVersionNumber10_8_5) {
+        // We are not running on an OS with BEAST mitigations - Don't display this as a configuration option
         [checkbox_beastDisable setHidden:YES];
     }