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>

bcrypt: Require macOS version 10.7 or newer for encryption support.
68cff26b · Hans Leidekker · Alexandre Julliard · dda67031 · 68cff26b
Commit 68cff26b authored Dec 19, 2017 by Hans Leidekker Committed by Alexandre Julliard Dec 19, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

bcrypt_main.c dlls/bcrypt/bcrypt_main.c +3 -2

No files found.
--- 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;