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

Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

bcrypt: Default to building with GnuTLS support on macOS, if present.
8b8a32f7 · Hans Leidekker · Alexandre Julliard · 1604cdae · 8b8a32f7 · 8b8a32f7
Commit 8b8a32f7 authored Jul 20, 2018 by Hans Leidekker Committed by Alexandre Julliard Jul 20, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

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

gnutls.c dlls/bcrypt/gnutls.c +1 -1

macos.c dlls/bcrypt/macos.c +1 -1

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

--- 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);


--- 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 )