Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
65634bca
Commit
65634bca
authored
Oct 26, 2011
by
Charles Davis
Committed by
Alexandre Julliard
Oct 27, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4.
parent
91c17c83
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
0 deletions
+38
-0
configure
configure
+14
-0
configure.ac
configure.ac
+5
-0
schannel_macosx.c
dlls/secur32/schannel_macosx.c
+16
-0
config.h.in
include/config.h.in
+3
-0
No files found.
configure
View file @
65634bca
...
...
@@ -6499,6 +6499,20 @@ fi
then
SECURITYLIB
=
"-framework Security -framework CoreFoundation"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"
$LIBS
$SECURITYLIB
"
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
"
with_gnutls
=
${
with_gnutls
:-
no
}
fi
if
test
"
$ac_cv_header_CoreAudio_CoreAudio_h
"
=
"yes"
-a
"
$ac_cv_header_AudioUnit_AudioUnit_h
"
=
"yes"
...
...
configure.ac
View file @
65634bca
...
...
@@ -720,6 +720,11 @@ case $host_os in
if test "$ac_cv_header_Security_Security_h" = "yes"
then
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
dnl Check for the SSLCopyPeerCertificates function
ac_save_LIBS="$LIBS"
LIBS="$LIBS $SECURITYLIB"
AC_CHECK_FUNCS(SSLCopyPeerCertificates)
LIBS="$ac_save_LIBS"
with_gnutls=${with_gnutls:-no}
fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
...
...
dlls/secur32/schannel_macosx.c
View file @
65634bca
...
...
@@ -670,6 +670,13 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session,
return
SEC_E_OK
;
}
#ifndef HAVE_SSLCOPYPEERCERTIFICATES
static
void
schan_imp_cf_release
(
const
void
*
arg
,
void
*
ctx
)
{
CFRelease
(
arg
);
}
#endif
SECURITY_STATUS
schan_imp_get_session_peer_certificate
(
schan_imp_session
session
,
PCCERT_CONTEXT
*
cert
)
{
...
...
@@ -680,7 +687,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session
TRACE
(
"(%p/%p, %p)
\n
"
,
s
,
s
->
context
,
cert
);
#ifdef HAVE_SSLCOPYPEERCERTIFICATES
status
=
SSLCopyPeerCertificates
(
s
->
context
,
&
certs
);
#else
status
=
SSLGetPeerCertificates
(
s
->
context
,
&
certs
);
#endif
if
(
status
==
noErr
&&
certs
)
{
SecCertificateRef
mac_cert
;
...
...
@@ -702,6 +713,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session
}
else
WARN
(
"Couldn't extract certificate data
\n
"
);
#ifndef HAVE_SSLCOPYPEERCERTIFICATES
/* This is why SSLGetPeerCertificates was deprecated */
CFArrayApplyFunction
(
certs
,
CFRangeMake
(
0
,
CFArrayGetCount
(
certs
)),
schan_imp_cf_release
,
NULL
);
#endif
CFRelease
(
certs
);
}
else
...
...
include/config.h.in
View file @
65634bca
...
...
@@ -746,6 +746,9 @@
/* Define to 1 if the system has the type `ssize_t'. */
#undef HAVE_SSIZE_T
/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */
#undef HAVE_SSLCOPYPEERCERTIFICATES
/* Define to 1 if you have the `statfs' function. */
#undef HAVE_STATFS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment