Hans Leidekker : bcrypt: Require macOS version 10.7 or newer for encryption support.
Module: wine Branch: master Commit: 68cff26b1b2d9d83b5f0a16b16f78c1b57f62ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cff26b1b2d9d83b5f0a16b16... Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 19 15:40:19 2017 +0100 bcrypt: Require macOS version 10.7 or newer for encryption support. Reported by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35c0e4a..55cf2f6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <AvailabilityMacros.h> #include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> @@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se 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 ) { ULONG ret = 0, size = sizeof(ret); @@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); 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 object hdr;
participants (1)
-
Alexandre Julliard