ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <cdavis@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Chip Davis 2021-09-27 15:59:26 -05:00 committed by Alexandre Julliard
parent 699fc68f2a
commit 5c0fe4db7d
4 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -8959,20 +8959,6 @@ fi
then then
SECURITY_LIBS="-framework Security -framework CoreFoundation" 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 fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes"
then then

5
configure.ac
View File

@ -783,11 +783,6 @@ case $host_os in
if test "$ac_cv_header_Security_Security_h" = "yes" if test "$ac_cv_header_Security_Security_h" = "yes"
then then
AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") 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 fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes"
then then

16
dlls/secur32/schannel_macosx.c
View File

@ -1047,13 +1047,6 @@ static SECURITY_STATUS CDECL schan_get_unique_channel_binding(schan_session sess
return SEC_E_UNSUPPORTED_FUNCTION; 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) 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; 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); TRACE("(%p/%p, %p)\n", s, s->context, list);
#ifdef HAVE_SSLCOPYPEERCERTIFICATES
status = SSLCopyPeerCertificates(s->context, &cert_array); status = SSLCopyPeerCertificates(s->context, &cert_array);
#else
status = SSLGetPeerCertificates(s->context, &cert_array);
#endif
if (status != noErr || !cert_array) if (status != noErr || !cert_array)
{ {
WARN("SSLCopyPeerCertificates failed: %d\n", status); WARN("SSLCopyPeerCertificates failed: %d\n", status);
@ -1118,11 +1107,6 @@ static SECURITY_STATUS CDECL schan_get_session_peer_certificate(schan_session se
CFRelease(data); 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); CFRelease(cert_array);
return ret; return ret;
} }

3
include/config.h.in
View File

@ -597,9 +597,6 @@
/* Define to 1 if the system has the type `sigset_t'. */ /* Define to 1 if the system has the type `sigset_t'. */
#undef HAVE_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. */ /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H