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

secur32: Use a pthread mutex in the macOS backend. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2021-05-07 11:54:40 +02:00 committed by Alexandre Julliard
parent 4a45679f1a
commit a84b02992b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/secur32/Makefile.in
View File

@ -3,7 +3,7 @@ IMPORTLIB = secur32
IMPORTS = advapi32
DELAYIMPORTS = crypt32
EXTRAINCL = $(GNUTLS_CFLAGS)
EXTRALIBS = $(SECURITY_LIBS)
EXTRALIBS = $(SECURITY_LIBS) $(PTHREAD_LIBS)
C_SRCS = \
lsa.c \

17
dlls/secur32/schannel_macosx.c
View File

@ -23,6 +23,7 @@
#include "wine/port.h"
#include <stdarg.h>
#include <pthread.h>
#ifdef HAVE_SECURITY_SECURITY_H
#include <Security/Security.h>
#define GetCurrentThread GetCurrentThread_Mac
@ -190,10 +191,9 @@ struct mac_session {
SSLContextRef context;
struct schan_transport *transport;
enum schan_mode mode;
CRITICAL_SECTION cs;
pthread_mutex_t mutex;
};
enum {
schan_proto_SSL,
schan_proto_TLS,
@ -760,8 +760,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre
if (!s)
return FALSE;
InitializeCriticalSection(&s->cs);
s->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": mac_session.cs");
pthread_mutex_init(&s->mutex, NULL);
status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context);
if (status != noErr)
@ -826,7 +825,7 @@ void schan_imp_dispose_session(schan_imp_session session)
status = SSLDisposeContext(s->context);
if (status != noErr)
ERR("Failed to dispose of session context: %d\n", status);
DeleteCriticalSection(&s->cs);
pthread_mutex_destroy(&s->mutex);
heap_free(s);
}
@ -1124,13 +1123,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer,
TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length);
EnterCriticalSection(&s->cs);
pthread_mutex_lock(&s->mutex);
s->mode = schan_mode_WRITE;
status = SSLWrite(s->context, buffer, *length, length);
s->mode = schan_mode_NONE;
LeaveCriticalSection(&s->cs);
pthread_mutex_unlock(&s->mutex);
if (status == noErr)
TRACE("Wrote %lu bytes\n", *length);
@ -1161,13 +1160,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer,
TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length);
EnterCriticalSection(&s->cs);
pthread_mutex_lock(&s->mutex);
s->mode = schan_mode_READ;
status = SSLRead(s->context, buffer, *length, length);
s->mode = schan_mode_NONE;
LeaveCriticalSection(&s->cs);
pthread_mutex_unlock(&s->mutex);
if (status == noErr || status == errSSLClosedGraceful)
TRACE("Read %lu bytes\n", *length);