Security-57337.60.2.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecTrustSettings.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecTrustSettings.cpp b/OSX/libsecurity_keychain/lib/SecTrustSettings.cpp
index 42dac0f12c3adf008114e95fdfe9ef2ee75585a0..5e292c988ba70eb5972b181bcc553f7c5871f774 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecTrustSettings.cpp
+++ b/OSX/libsecurity_keychain/lib/SecTrustSettings.cpp
@@ -462,46 +462,6 @@ static OSStatus _tsEnsuredInitialized(void)
     }
     return status;
 }
-
-#define APPNAMEWORKAROUND_KEY CFSTR("WorkaroundAppNames")
-#define APPNAMEWORKAROUND_DOMAIN CFSTR("com.apple.security")
-
-static bool tsCheckAppNameWorkaround(const char *name)
-{
-       bool result = false;
-       CFIndex idx, count;
-       CFStringRef str =
-           CFStringCreateWithCString (NULL, name, kCFStringEncodingUTF8);
-       CFArrayRef value = (CFArrayRef)
-           CFPreferencesCopyValue (APPNAMEWORKAROUND_KEY,
-                                   APPNAMEWORKAROUND_DOMAIN,
-                                   kCFPreferencesCurrentUser,
-                                   kCFPreferencesAnyHost);
-       if (!str || !value ||
-               !(CFArrayGetTypeID() == CFGetTypeID(value))) {
-               goto cleanup;
-       }
-       count = CFArrayGetCount(value);
-       for (idx = 0; idx < count; idx++) {
-               CFStringRef appstr = (CFStringRef) CFArrayGetValueAtIndex(value, idx);
-               if (!(appstr) || !(CFStringGetTypeID() == CFGetTypeID(appstr))) {
-                       continue;
-               }
-               if (!CFStringCompare(str, appstr, 0)) {
-                       result = true;
-                       break;
-               }
-       }
-
-cleanup:
-       if (str) {
-               CFRelease(str);
-       }
-       if (value) {
-               CFRelease(value);
-       }
-       return result;
-}
 #endif
 
 static void tsAddConditionalCerts(CFMutableArrayRef certArray)
@@ -515,17 +475,14 @@ static void tsAddConditionalCerts(CFMutableArrayRef certArray)
 
        if (!certArray) { return; }
 
-       pid_t pid = getpid();
-       char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
-       int ret = proc_name(pid, pathbuf, sizeof(pathbuf));
-       if (ret <= 0) { return; }
-
        OSStatus status = _tsEnsuredInitialized();
-       if ((status == 0 && sCSCheckFix_f(CFSTR("21946795"))) ||
-               tsCheckAppNameWorkaround(pathbuf)) {
+       if (status == 0 && sCSCheckFix_f(CFSTR("21946795"))) {
                // conditionally include these 1024-bit roots
                const certmap_entry_t certmap[] = {
+                       { _EquifaxSecureCA, sizeof(_EquifaxSecureCA) },
                        { _GTECyberTrustGlobalRootCA, sizeof(_GTECyberTrustGlobalRootCA) },
+                       { _ThawtePremiumServerCA, sizeof(_ThawtePremiumServerCA) },
+                       { _ThawteServerCA, sizeof(_ThawteServerCA) },
                        { _VeriSignClass3CA, sizeof(_VeriSignClass3CA) },
                };
                unsigned int i, certmaplen = sizeof(certmap) / sizeof(certmap_entry_t);