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

bcrypt: Require macOS version 10.7 or newer for encryption support. 

Reported by Ryan Schmidt.

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2017-12-19 15:40:19 +01:00 committed by Alexandre Julliard
parent dda67031c7
commit 68cff26b1b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/bcrypt/bcrypt_main.c
View File

@ -22,6 +22,7 @@
#include <stdarg.h> #include <stdarg.h>
#ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H
#include <AvailabilityMacros.h>
#include <CommonCrypto/CommonCryptor.h> #include <CommonCrypto/CommonCryptor.h>
#elif defined(SONAME_LIBGNUTLS) #elif defined(SONAME_LIBGNUTLS)
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
return BCryptDestroyHash( handle ); return BCryptDestroyHash( handle );
} }
#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
static ULONG get_block_size( enum alg_id alg ) static ULONG get_block_size( enum alg_id alg )
{ {
ULONG ret = 0, size = sizeof(ret); ULONG ret = 0, size = sizeof(ret);
@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key )
HeapFree( GetProcessHeap(), 0, key ); HeapFree( GetProcessHeap(), 0, key );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
struct key struct key
{ {
struct object hdr; struct object hdr;