bcrypt-Improvements: Fix compilation on OSX when both gnutls and comm…

…oncrypto is available.

patches/bcrypt-Improvements/0001-bcrypt-Add-AES-provider.patch

@@ -1,4 +1,4 @@
-From c178117abacbf8644ae05429999ff8e8f8585a7e Mon Sep 17 00:00:00 2001
+From 489a67ec803b382248134be53f3449c206e208ff Mon Sep 17 00:00:00 2001
 From: Hans Leidekker <hans@codeweavers.com>
 Date: Mon, 19 Dec 2016 19:38:52 +0100
 Subject: bcrypt: Add AES provider.
@@ -53,7 +53,7 @@ index e299fe0cce8..962953e509b 100644
  @ stub BCryptUnregisterConfigChangeNotify
  @ stub BCryptUnregisterProvider
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 6023c942e49..5e066283f6e 100644
+index 6023c942e49..5867dbdc3fa 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
 @@ -49,6 +49,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -208,7 +208,7 @@ index 6023c942e49..5e066283f6e 100644
      return BCryptDestroyHash( handle );
  }
 
-+#if defined(HAVE_GNUTLS_HASH)
++#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
 +struct key
 +{
 +    struct object      hdr;