Commit 5015f388 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

secur32: Add alternative schannel implementation for Mac OS X.

It uses the native Secure Transport API rather than GnuTLS.
parent 25ed687f
...@@ -3,6 +3,7 @@ IMPORTLIB = secur32 ...@@ -3,6 +3,7 @@ IMPORTLIB = secur32
IMPORTS = netapi32 advapi32 IMPORTS = netapi32 advapi32
DELAYIMPORTS = crypt32 DELAYIMPORTS = crypt32
EXTRAINCL = @GNUTLSINCL@ EXTRAINCL = @GNUTLSINCL@
EXTRALIBS = @SECURITYLIB@
C_SRCS = \ C_SRCS = \
base64_codec.c \ base64_codec.c \
...@@ -13,6 +14,7 @@ C_SRCS = \ ...@@ -13,6 +14,7 @@ C_SRCS = \
ntlm.c \ ntlm.c \
schannel.c \ schannel.c \
schannel_gnutls.c \ schannel_gnutls.c \
schannel_macosx.c \
secur32.c \ secur32.c \
thunks.c \ thunks.c \
util.c \ util.c \
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DEFAULT_DEBUG_CHANNEL(secur32);
#ifdef SONAME_LIBGNUTLS #if defined(SONAME_LIBGNUTLS) || defined (HAVE_SECURITY_SECURITY_H)
#define SCHAN_INVALID_HANDLE ~0UL #define SCHAN_INVALID_HANDLE ~0UL
...@@ -1316,7 +1316,7 @@ void SECUR32_deinitSchannelSP(void) ...@@ -1316,7 +1316,7 @@ void SECUR32_deinitSchannelSP(void)
schan_imp_deinit(); schan_imp_deinit();
} }
#else /* SONAME_LIBGNUTLS */ #else /* SONAME_LIBGNUTLS || HAVE_SECURITY_SECURITY_H */
void SECUR32_initSchannelSP(void) void SECUR32_initSchannelSP(void)
{ {
...@@ -1325,4 +1325,4 @@ void SECUR32_initSchannelSP(void) ...@@ -1325,4 +1325,4 @@ void SECUR32_initSchannelSP(void)
void SECUR32_deinitSchannelSP(void) {} void SECUR32_deinitSchannelSP(void) {}
#endif /* SONAME_LIBGNUTLS */ #endif /* SONAME_LIBGNUTLS || HAVE_SECURITY_SECURITY_H */
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DEFAULT_DEBUG_CHANNEL(secur32);
#ifdef SONAME_LIBGNUTLS #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H)
static void *libgnutls_handle; static void *libgnutls_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f #define MAKE_FUNCPTR(f) static typeof(f) * p##f
...@@ -459,4 +459,4 @@ void schan_imp_deinit(void) ...@@ -459,4 +459,4 @@ void schan_imp_deinit(void)
libgnutls_handle = NULL; libgnutls_handle = NULL;
} }
#endif /* SONAME_LIBGNUTLS */ #endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment