Commit bd3ca663 authored by Melissa Mears's avatar Melissa Mears Committed by Nick Zitzmann
Browse files

darwinssl: Fix #if 10.6.0 for SecKeychainSearch 

The comment here says that SecKeychainSearch causes a deprecation
warning when used with a minimum Mac OS X SDK version of 10.7.0, which
is correct.  However, the #if guard did not match.  It was intended to
only use the code if 10.6.0 support was enabled, but it had 10.7.0
instead.  This caused a warning if the minimum was exactly 10.7.0.
parent 92e607ab

lib/curl_darwinssl.c

+4 −4
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ CF_INLINE CFStringRef CopyCertSubject(SecCertificateRef cert) 
  return server_cert_summary;

}



#if CURL_SUPPORT_MAC_10_7

#if CURL_SUPPORT_MAC_10_6

/* The SecKeychainSearch API was deprecated in Lion, and using it will raise

   deprecation warnings, so let's not compile this unless it's necessary: */

static OSStatus CopyIdentityWithLabelOldSchool(char *label,
@@ -874,7 +874,7 @@ static OSStatus CopyIdentityWithLabelOldSchool(char *label, 
    CFRelease(search);

  return status;

}

#endif /* CURL_SUPPORT_MAC_10_7 */

#endif /* CURL_SUPPORT_MAC_10_6 */



static OSStatus CopyIdentityWithLabel(char *label,

                                      SecIdentityRef *out_cert_and_key)
@@ -914,12 +914,12 @@ static OSStatus CopyIdentityWithLabel(char *label, 
    CFRelease(query_dict);

  }

  else {

#if CURL_SUPPORT_MAC_10_7

#if CURL_SUPPORT_MAC_10_6

    /* On Leopard and Snow Leopard, fall back to SecKeychainSearch. */

    status = CopyIdentityWithLabelOldSchool(label, out_cert_and_key);

#endif /* CURL_SUPPORT_MAC_10_7 */

  }

#elif CURL_SUPPORT_MAC_10_7

#elif CURL_SUPPORT_MAC_10_6

  /* For developers building on older cats, we have no choice but to fall back

     to SecKeychainSearch. */

  status = CopyIdentityWithLabelOldSchool(label, out_cert_and_key);