Hans Leidekker : bcrypt: Default to building with GnuTLS support on macOS, if present.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8b8a32f7a8e72658e14c3fe0972009dead59bfa9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8b8a32f7a8e72658e14c3fe09...

Author: Hans Leidekker 
Date:   Fri Jul 20 14:51:14 2018 +0200

bcrypt: Default to building with GnuTLS support on macOS, if present.

Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/bcrypt/bcrypt_main.c | 5 ++---
 dlls/bcrypt/gnutls.c      | 2 +-
 dlls/bcrypt/macos.c       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 851767d..4edfbdd 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -815,7 +815,6 @@ void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *
 }
 #endif

-
 #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 BOOL key_is_symmetric( struct key *key )
 {
@@ -1421,14 +1420,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
     case DLL_PROCESS_ATTACH:
         instance = hinst;
         DisableThreadLibraryCalls( hinst );
-#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
+#ifdef HAVE_GNUTLS_CIPHER_INIT
         gnutls_initialize();
 #endif
         break;

case DLL_PROCESS_DETACH:
         if (reserved) break;
-#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
+#ifdef HAVE_GNUTLS_CIPHER_INIT
         gnutls_uninitialize();
 #endif
         break;
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index f191d2c..f5bc0e5 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -42,7 +42,7 @@
 #include "wine/library.h"
 #include "wine/unicode.h"

-#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
+#ifdef HAVE_GNUTLS_CIPHER_INIT
 WINE_DEFAULT_DEBUG_CHANNEL(bcrypt);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);

diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
index 94d5dbd..a6eaee8 100644
--- a/dlls/bcrypt/macos.c
+++ b/dlls/bcrypt/macos.c
@@ -41,7 +41,7 @@
 #include "wine/library.h"
 #include "wine/unicode.h"

-#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT)
 WINE_DEFAULT_DEBUG_CHANNEL(bcrypt);

NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )