Chip Davis : configure: Stop checking for SSLCopyPeerCertificates().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5c0fe4db7d580784ab6adc361bfed981be25753c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5c0fe4db7d580784ab6adc361...

Author: Chip Davis 
Date:   Mon Sep 27 15:59:26 2021 -0500

configure: Stop checking for SSLCopyPeerCertificates().

This function was introduced in 10.5, and we now require 10.8. We can
safely assume it is present.

Signed-off-by: Chip Davis 
Signed-off-by: Alexandre Julliard

---

configure                      | 14 --------------
 configure.ac                   |  5 -----
 dlls/secur32/schannel_macosx.c | 16 ----------------
 include/config.h.in            |  3 ---
 4 files changed, 38 deletions(-)

diff --git a/configure b/configure
index 7c2f53f5655..e32b363b3fc 100755
--- a/configure
+++ b/configure
@@ -8959,20 +8959,6 @@ fi
     then
         SECURITY_LIBS="-framework Security -framework CoreFoundation"

-                ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $SECURITY_LIBS"
-        for ac_func in SSLCopyPeerCertificates
-do :
-  ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates"
-if test "x$ac_cv_func_SSLCopyPeerCertificates" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SSLCOPYPEERCERTIFICATES 1
-_ACEOF
-
-fi
-done
-
-        LIBS="$ac_save_LIBS"
     fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes"
     then
diff --git a/configure.ac b/configure.ac
index c0a126293c4..9fa8ff3e394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,11 +783,6 @@ case $host_os in
     if test "$ac_cv_header_Security_Security_h" = "yes"
     then
         AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation")
-        dnl Check for the SSLCopyPeerCertificates function
-        ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $SECURITY_LIBS"
-        AC_CHECK_FUNCS(SSLCopyPeerCertificates)
-        LIBS="$ac_save_LIBS"
     fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes"
     then
diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c
index 2f802f96686..523f8c63562 100644
--- a/dlls/secur32/schannel_macosx.c
+++ b/dlls/secur32/schannel_macosx.c
@@ -1047,13 +1047,6 @@ static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session sess
     return SEC_E_UNSUPPORTED_FUNCTION;
 }

-#ifndef HAVE_SSLCOPYPEERCERTIFICATES
-static void cf_release(const void *arg, void *ctx)
-{
-    CFRelease(arg);
-}
-#endif
-
 static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session session, struct schan_cert_list *list)
 {
     struct mac_session *s = (struct mac_session *)session;
@@ -1068,11 +1061,7 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se

TRACE("(%p/%p, %p)\n", s, s->context, list);

-#ifdef HAVE_SSLCOPYPEERCERTIFICATES
     status = SSLCopyPeerCertificates(s->context, &cert_array);
-#else
-    status = SSLGetPeerCertificates(s->context, &cert_array);
-#endif
     if (status != noErr || !cert_array)
     {
         WARN("SSLCopyPeerCertificates failed: %d\n", status);
@@ -1118,11 +1107,6 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se
         CFRelease(data);
     }

-done:
-#ifndef HAVE_SSLCOPYPEERCERTIFICATES
-    /* This is why SSLGetPeerCertificates was deprecated */
-    CFArrayApplyFunction(cert_array, CFRangeMake(0, CFArrayGetCount(cert_array)), cf_release, NULL);
-#endif
     CFRelease(cert_array);
     return ret;
 }
diff --git a/include/config.h.in b/include/config.h.in
index f66444fd715..c0d326cee39 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -597,9 +597,6 @@
 /* Define to 1 if the system has the type `sigset_t'. */
 #undef HAVE_SIGSET_T

-/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */
-#undef HAVE_SSLCOPYPEERCERTIFICATES
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H