diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 99b382f8..15ee00f4 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -237,6 +237,7 @@ patch_enable_all () enable_quartz_MediaSeeking_Positions="$1" enable_riched20_Class_Tests="$1" enable_riched20_IText_Interface="$1" + enable_secur32_macos_compile="$1" enable_server_Desktop_Refcount="$1" enable_server_FileEndOfFileInformation="$1" enable_server_File_Permissions="$1" @@ -823,6 +824,9 @@ patch_enable () riched20-IText_Interface) enable_riched20_IText_Interface="$2" ;; + secur32-macos-compile) + enable_secur32_macos_compile="$2" + ;; server-Desktop_Refcount) enable_server_Desktop_Refcount="$2" ;; @@ -5398,6 +5402,18 @@ if test "$enable_riched20_IText_Interface" -eq 1; then ) >> "$patchlist" fi +# Patchset secur32-macos-compile +# | +# | Modified files: +# | * dlls/secur32/schannel_macosx.c +# | +if test "$enable_secur32_macos_compile" -eq 1; then + patch_apply secur32-macos-compile/0001-secur32-Add-schan_imp_get_application_protocol-for-m.patch + ( + printf '%s\n' '+ { "Alistair Leslie-Hughes", "secur32: Add schan_imp_get_application_protocol for macos.", 1 },'; + ) >> "$patchlist" +fi + # Patchset server-Desktop_Refcount # | # | This patchset has the following (direct or indirect) dependencies: diff --git a/patches/secur32-macos-compile/0001-secur32-Add-schan_imp_get_application_protocol-for-m.patch b/patches/secur32-macos-compile/0001-secur32-Add-schan_imp_get_application_protocol-for-m.patch new file mode 100644 index 00000000..b3e203b3 --- /dev/null +++ b/patches/secur32-macos-compile/0001-secur32-Add-schan_imp_get_application_protocol-for-m.patch @@ -0,0 +1,41 @@ +From 945050ac121f63a56af7d0d740d84481c454ba31 Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Sat, 11 Apr 2020 17:15:18 +1000 +Subject: [PATCH] secur32: Add schan_imp_get_application_protocol for macos + +--- + dlls/secur32/schannel_macosx.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c +index f86a561cf8d..378ab30ad1d 100644 +--- a/dlls/secur32/schannel_macosx.c ++++ b/dlls/secur32/schannel_macosx.c +@@ -849,6 +849,24 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) + SSLSetPeerDomainName( s->context, target, strlen(target) ); + } + ++void schan_imp_set_application_protocols(schan_imp_session session, unsigned char *buffer, unsigned int buflen) ++{ ++ struct mac_session *s = (struct mac_session*)session; ++ ++ TRACE("(%p/%p, %p, %d)\n", s, s->context, buffer, buflen); ++} ++ ++SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, ++ SecPkgContext_ApplicationProtocol *protocol) ++{ ++ struct mac_session *s = (struct mac_session*)session; ++ ++ TRACE("(%p/%p, %p)\n", s, s->context, protocol); ++ ++ memset(protocol, 0, sizeof(*protocol)); ++ return SEC_E_OK; ++} ++ + SECURITY_STATUS schan_imp_handshake(schan_imp_session session) + { + struct mac_session *s = (struct mac_session*)session; +-- +2.25.1 +