Release 2.4.

patches/api-ms-win-Stub_DLLs/definition

@@ -20,6 +20,5 @@ Fixes: Add kernelbase dll
 Fixes: Add iertutil dll
 Fixes: Add shcore dll
 Fixes: [40451] Add feclient dll
-Depends: kernel32-GetCurrentPackageFamilyName
 Depends: combase-RoApi
 Depends: kernel32-UmsStubs

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

@@ -1,18 +1,18 @@
-From 489a67ec803b382248134be53f3449c206e208ff Mon Sep 17 00:00:00 2001
+From b05734fe9746e5dbbfcf248b2b892d6e09006956 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.
 
 ---
  dlls/bcrypt/bcrypt.spec    |  10 +-
- dlls/bcrypt/bcrypt_main.c  | 347 ++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/bcrypt/bcrypt_main.c  | 353 ++++++++++++++++++++++++++++++++++++++++++++-
  dlls/bcrypt/tests/bcrypt.c |  18 +--
  dlls/ncrypt/ncrypt.spec    |  10 +-
  include/bcrypt.h           |   3 +
- 5 files changed, 357 insertions(+), 31 deletions(-)
+ 5 files changed, 361 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index e299fe0cce8..962953e509b 100644
+index a1cce4423dc..9ecd21d767c 100644
 --- a/dlls/bcrypt/bcrypt.spec
 +++ b/dlls/bcrypt/bcrypt.spec
 @@ -5,15 +5,15 @@
@@ -27,7 +27,7 @@ index e299fe0cce8..962953e509b 100644
 -@ stub BCryptDestroyKey
 +@ stdcall BCryptDestroyKey(ptr)
  @ stub BCryptDestroySecret
- @ stub BCryptDuplicateHash
+ @ stdcall BCryptDuplicateHash(ptr ptr ptr long long)
  @ stub BCryptDuplicateKey
 -@ stub BCryptEncrypt
 +@ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long)
@@ -53,10 +53,10 @@ index e299fe0cce8..962953e509b 100644
  @ stub BCryptUnregisterConfigChangeNotify
  @ stub BCryptUnregisterProvider
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 6023c942e49..5867dbdc3fa 100644
+index 80d7ddb9466..247b3dc7327 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -49,6 +49,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
+@@ -51,6 +51,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
  
  static void *libgnutls_handle;
  #define MAKE_FUNCPTR(f) static typeof(f) * p##f
@@ -67,7 +67,7 @@ index 6023c942e49..5867dbdc3fa 100644
  MAKE_FUNCPTR(gnutls_global_deinit);
  MAKE_FUNCPTR(gnutls_global_init);
  MAKE_FUNCPTR(gnutls_global_set_log_function);
-@@ -84,6 +88,10 @@ static BOOL gnutls_initialize(void)
+@@ -80,6 +84,10 @@ static BOOL gnutls_initialize(void)
          goto fail; \
      }
  
@@ -78,7 +78,7 @@ index 6023c942e49..5867dbdc3fa 100644
      LOAD_FUNCPTR(gnutls_global_deinit)
      LOAD_FUNCPTR(gnutls_global_init)
      LOAD_FUNCPTR(gnutls_global_set_log_function)
-@@ -138,6 +146,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount,
+@@ -128,6 +136,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount,
  
  #define MAGIC_ALG  (('A' << 24) | ('L' << 16) | ('G' << 8) | '0')
  #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H')
@@ -86,7 +86,7 @@ index 6023c942e49..5867dbdc3fa 100644
  struct object
  {
      ULONG magic;
-@@ -145,6 +154,7 @@ struct object
+@@ -135,6 +144,7 @@ struct object
  
  enum alg_id
  {
@@ -94,15 +94,15 @@ index 6023c942e49..5867dbdc3fa 100644
      ALG_ID_MD5,
      ALG_ID_RNG,
      ALG_ID_SHA1,
-@@ -157,6 +167,7 @@ static const struct {
-     ULONG hash_length;
+@@ -152,6 +162,7 @@ static const struct {
+     ULONG block_bits;
      const WCHAR *alg_name;
  } alg_props[] = {
-+    /* ALG_ID_AES    */ {  0, BCRYPT_AES_ALGORITHM },
-     /* ALG_ID_MD5    */ { 16, BCRYPT_MD5_ALGORITHM },
-     /* ALG_ID_RNG    */ {  0, BCRYPT_RNG_ALGORITHM },
-     /* ALG_ID_SHA1   */ { 20, BCRYPT_SHA1_ALGORITHM },
-@@ -215,11 +226,10 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
++    /* ALG_ID_AES    */ {  654,    0,    0, BCRYPT_AES_ALGORITHM },
+     /* ALG_ID_MD5    */ {  274,   16,  512, BCRYPT_MD5_ALGORITHM },
+     /* ALG_ID_RNG    */ {    0,    0,    0, BCRYPT_RNG_ALGORITHM },
+     /* ALG_ID_SHA1   */ {  278,   20,  512, BCRYPT_SHA1_ALGORITHM },
+@@ -210,11 +221,10 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
  
  NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
  {
@@ -115,7 +115,7 @@ index 6023c942e49..5867dbdc3fa 100644
      TRACE( "%p, %s, %s, %08x\n", handle, wine_dbgstr_w(id), wine_dbgstr_w(implementation), flags );
  
      if (!handle || !id) return STATUS_INVALID_PARAMETER;
-@@ -229,9 +239,10 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
+@@ -224,9 +234,10 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
          return STATUS_NOT_IMPLEMENTED;
      }
  
@@ -127,48 +127,36 @@ index 6023c942e49..5867dbdc3fa 100644
      else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256;
      else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384;
      else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512;
-@@ -430,7 +441,6 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size )
- static NTSTATUS hmac_finish( struct hash *hash, UCHAR *output, ULONG size )
- {
-     CCHmacFinal( &hash->u.hmac_ctx, output );
--
-     return STATUS_SUCCESS;
- }
- #elif defined(HAVE_GNUTLS_HASH)
-@@ -586,12 +596,19 @@ static NTSTATUS hmac_finish( struct hash *hash, UCHAR *output, ULONG size )
- }
- #endif
- 
-+#ifdef _WIN64
-+#define OBJECT_LENGTH_AES       654
-+#else
-+#define OBJECT_LENGTH_AES       618
-+#endif
- #define OBJECT_LENGTH_MD5       274
- #define OBJECT_LENGTH_SHA1      278
- #define OBJECT_LENGTH_SHA256    286
- #define OBJECT_LENGTH_SHA384    382
- #define OBJECT_LENGTH_SHA512    382
+@@ -388,6 +399,8 @@ struct hash
+     struct hash_impl inner;
+ };
  
 +#define BLOCK_LENGTH_AES        16
 +
  static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
  {
-     if (!strcmpW( prop, BCRYPT_HASH_LENGTH ))
-@@ -628,6 +645,34 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf,
+     if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH ))
+@@ -432,9 +445,43 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf,
+     NTSTATUS status;
  
-     switch (id)
-     {
+     status = generic_alg_property( id, prop, buf, size, ret_size );
+-    if (status == STATUS_NOT_IMPLEMENTED)
+-        FIXME( "unsupported property %s\n", debugstr_w(prop) );
+-    return status;
++    if (status != STATUS_NOT_IMPLEMENTED)
++        return status;
++
++    switch (id)
++    {
 +    case ALG_ID_AES:
 +        if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH ))
 +        {
-+            value = BLOCK_LENGTH_AES;
-+            break;
-+        }
-+        if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH ))
-+        {
-+            value = OBJECT_LENGTH_AES;
-+            break;
++            *ret_size = sizeof(ULONG);
++            if (size < sizeof(ULONG))
++                return STATUS_BUFFER_TOO_SMALL;
++            if (buf)
++                *(ULONG *)buf = BLOCK_LENGTH_AES;
++            return STATUS_SUCCESS;
 +        }
 +        if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
 +        {
@@ -184,13 +172,18 @@ index 6023c942e49..5867dbdc3fa 100644
 +                return STATUS_BUFFER_TOO_SMALL;
 +            }
 +        }
-+        FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) );
-+        return STATUS_NOT_IMPLEMENTED;
++        break;
 +
-     case ALG_ID_MD5:
-         if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH ))
-         {
-@@ -731,6 +776,13 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
++    default:
++        break;
++    }
++
++    FIXME( "unsupported property %s\n", debugstr_w(prop) );
++    return STATUS_NOT_IMPLEMENTED;
+ }
+ 
+ static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
+@@ -474,6 +521,13 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
      }
  }
  
@@ -204,7 +197,7 @@ index 6023c942e49..5867dbdc3fa 100644
  NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen,
                                    UCHAR *secret, ULONG secretlen, ULONG flags )
  {
-@@ -854,6 +906,293 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
+@@ -632,6 +686,293 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
      return BCryptDestroyHash( handle );
  }
  
@@ -499,10 +492,10 @@ index 6023c942e49..5867dbdc3fa 100644
  {
      switch (reason)
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 422f2cfd340..d2df74ed919 100644
+index 42312b45b78..4d5891b461b 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -780,7 +780,7 @@ static void test_aes(void)
+@@ -704,7 +704,7 @@ static void test_aes(void)
      ULONG size, len;
      UCHAR mode[64];
      NTSTATUS ret;
@@ -511,7 +504,7 @@ index 422f2cfd340..d2df74ed919 100644
      alg = NULL;
      ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_AES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0);
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-@@ -814,7 +814,6 @@ todo_wine {
+@@ -738,7 +738,6 @@ todo_wine {
      ret = pBCryptCloseAlgorithmProvider(alg, 0);
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
  }
@@ -519,7 +512,7 @@ index 422f2cfd340..d2df74ed919 100644
  
  static void test_BCryptGenerateSymmetricKey(void)
  {
-@@ -833,11 +832,6 @@ static void test_BCryptGenerateSymmetricKey(void)
+@@ -757,11 +756,6 @@ static void test_BCryptGenerateSymmetricKey(void)
      NTSTATUS ret;
  
      ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0);
@@ -531,7 +524,7 @@ index 422f2cfd340..d2df74ed919 100644
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
  
      len = size = 0xdeadbeef;
-@@ -922,11 +916,6 @@ static void test_BCryptEncrypt(void)
+@@ -846,11 +840,6 @@ static void test_BCryptEncrypt(void)
      NTSTATUS ret;
  
      ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0);
@@ -543,7 +536,7 @@ index 422f2cfd340..d2df74ed919 100644
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
  
      len = 0xdeadbeef;
-@@ -1013,11 +1002,6 @@ static void test_BCryptDecrypt(void)
+@@ -937,11 +926,6 @@ static void test_BCryptDecrypt(void)
      NTSTATUS ret;
  
      ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0);
@@ -556,7 +549,7 @@ index 422f2cfd340..d2df74ed919 100644
  
      len = 0xdeadbeef;
 diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index 04127608d68..60b7eb37075 100644
+index 6e871a5d6b8..1a78853bf49 100644
 --- a/dlls/ncrypt/ncrypt.spec
 +++ b/dlls/ncrypt/ncrypt.spec
 @@ -5,17 +5,17 @@
@@ -573,7 +566,7 @@ index 04127608d68..60b7eb37075 100644
 -@ stub BCryptDestroyKey
 +@ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey
  @ stub BCryptDestroySecret
- @ stub BCryptDuplicateHash
+ @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash
  @ stub BCryptDuplicateKey
 -@ stub BCryptEncrypt
 +@ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt

patches/bcrypt-Improvements/0002-bcrypt-Directly-implement-hmac-computation.patch

@@ -1,469 +0,0 @@
-From f527689b793100c79654ac5d6c1376d128ca3175 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 19 Dec 2016 23:58:52 +0100
-Subject: bcrypt: Directly implement hmac computation.
-
----
- dlls/bcrypt/bcrypt_main.c | 277 +++++++++++++++++-----------------------------
- 1 file changed, 104 insertions(+), 173 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 937bdf7..af2314a 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -60,9 +60,6 @@ MAKE_FUNCPTR(gnutls_global_set_log_level);
- MAKE_FUNCPTR(gnutls_hash);
- MAKE_FUNCPTR(gnutls_hash_deinit);
- MAKE_FUNCPTR(gnutls_hash_init);
--MAKE_FUNCPTR(gnutls_hmac);
--MAKE_FUNCPTR(gnutls_hmac_deinit);
--MAKE_FUNCPTR(gnutls_hmac_init);
- MAKE_FUNCPTR(gnutls_perror);
- #undef MAKE_FUNCPTR
- 
-@@ -99,9 +96,6 @@ static BOOL gnutls_initialize(void)
-     LOAD_FUNCPTR(gnutls_hash);
-     LOAD_FUNCPTR(gnutls_hash_deinit);
-     LOAD_FUNCPTR(gnutls_hash_init);
--    LOAD_FUNCPTR(gnutls_hmac);
--    LOAD_FUNCPTR(gnutls_hmac_deinit);
--    LOAD_FUNCPTR(gnutls_hmac_init);
-     LOAD_FUNCPTR(gnutls_perror)
- #undef LOAD_FUNCPTR
- 
-@@ -163,6 +157,8 @@ enum alg_id
-     ALG_ID_SHA512
- };
- 
-+#define MAX_HASH_OUTPUT_BYTES 64
-+
- static const struct {
-     ULONG hash_length;
-     const WCHAR *alg_name;
-@@ -183,6 +179,19 @@ struct algorithm
-     BOOL hmac;
- };
- 
-+#define MAX_HASH_BLOCK_BITS 1024
-+
-+int alg_block_bits[] =
-+{
-+    /* ALG_ID_AES    */    0,
-+    /* ALG_ID_MD5    */  512,
-+    /* ALG_ID_RNG    */    0,
-+    /* ALG_ID_SHA1   */  512,
-+    /* ALG_ID_SHA256 */  512,
-+    /* ALG_ID_SHA384 */ 1024,
-+    /* ALG_ID_SHA512 */ 1024
-+};
-+
- NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags)
- {
-     const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG;
-@@ -289,24 +298,20 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled)
- }
- 
- #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
--struct hash
-+struct hash_impl
- {
--    struct object hdr;
--    enum alg_id   alg_id;
--    BOOL hmac;
-     union
-     {
-         CC_MD5_CTX    md5_ctx;
-         CC_SHA1_CTX   sha1_ctx;
-         CC_SHA256_CTX sha256_ctx;
-         CC_SHA512_CTX sha512_ctx;
--        CCHmacContext hmac_ctx;
-     } u;
- };
- 
--static NTSTATUS hash_init( struct hash *hash )
-+static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
- {
--    switch (hash->alg_id)
-+    switch (alg_id)
-     {
-     case ALG_ID_MD5:
-         CC_MD5_Init( &hash->u.md5_ctx );
-@@ -329,50 +334,16 @@ static NTSTATUS hash_init( struct hash *hash )
-         break;
- 
-     default:
--        ERR( "unhandled id %u\n", hash->alg_id );
-+        ERR( "unhandled id %u\n", alg_id );
-         return STATUS_NOT_IMPLEMENTED;
-     }
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hmac_init( struct hash *hash, UCHAR *key, ULONG key_size )
-+static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *input, ULONG size )
- {
--    CCHmacAlgorithm cc_algorithm;
--    switch (hash->alg_id)
--    {
--    case ALG_ID_MD5:
--        cc_algorithm = kCCHmacAlgMD5;
--        break;
--
--    case ALG_ID_SHA1:
--        cc_algorithm = kCCHmacAlgSHA1;
--        break;
--
--    case ALG_ID_SHA256:
--        cc_algorithm = kCCHmacAlgSHA256;
--        break;
--
--    case ALG_ID_SHA384:
--        cc_algorithm = kCCHmacAlgSHA384;
--        break;
--
--    case ALG_ID_SHA512:
--        cc_algorithm = kCCHmacAlgSHA512;
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", hash->alg_id );
--        return STATUS_NOT_IMPLEMENTED;
--    }
--
--    CCHmacInit( &hash->u.hmac_ctx, cc_algorithm, key, key_size );
--    return STATUS_SUCCESS;
--}
--
--
--static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size )
--{
--    switch (hash->alg_id)
-+    switch (alg_id)
-     {
-     case ALG_ID_MD5:
-         CC_MD5_Update( &hash->u.md5_ctx, input, size );
-@@ -395,21 +366,16 @@ static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size )
-         break;
- 
-     default:
--        ERR( "unhandled id %u\n", hash->alg_id );
-+        ERR( "unhandled id %u\n", alg_id );
-         return STATUS_NOT_IMPLEMENTED;
-     }
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hmac_update( struct hash *hash, UCHAR *input, ULONG size )
--{
--    CCHmacUpdate( &hash->u.hmac_ctx, input, size );
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size )
-+static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *output, ULONG size )
- {
--    switch (hash->alg_id)
-+    switch (alg_id)
-     {
-     case ALG_ID_MD5:
-         CC_MD5_Final( output, &hash->u.md5_ctx );
-@@ -432,37 +398,25 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size )
-         break;
- 
-     default:
--        ERR( "unhandled id %u\n", hash->alg_id );
-+        ERR( "unhandled id %u\n", alg_id );
-         break;
-     }
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hmac_finish( struct hash *hash, UCHAR *output, ULONG size )
--{
--    CCHmacFinal( &hash->u.hmac_ctx, output );
--    return STATUS_SUCCESS;
--}
- #elif defined(HAVE_GNUTLS_HASH)
--struct hash
-+struct hash_impl
- {
--    struct object    hdr;
--    enum alg_id      alg_id;
--    BOOL hmac;
--    union
--    {
--        gnutls_hash_hd_t hash_handle;
--        gnutls_hmac_hd_t hmac_handle;
--    } u;
-+    gnutls_hash_hd_t hash_handle;
- };
- 
--static NTSTATUS hash_init( struct hash *hash )
-+static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
- {
-     gnutls_digest_algorithm_t alg;
- 
-     if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
- 
--    switch (hash->alg_id)
-+    switch (alg_id)
-     {
-     case ALG_ID_MD5:
-         alg = GNUTLS_DIG_MD5;
-@@ -484,117 +438,63 @@ static NTSTATUS hash_init( struct hash *hash )
-         break;
- 
-     default:
--        ERR( "unhandled id %u\n", hash->alg_id );
--        return STATUS_NOT_IMPLEMENTED;
--    }
--
--    if (pgnutls_hash_init( &hash->u.hash_handle, alg )) return STATUS_INTERNAL_ERROR;
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hmac_init( struct hash *hash, UCHAR *key, ULONG key_size )
--{
--    gnutls_mac_algorithm_t alg;
--
--    if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
--
--    switch (hash->alg_id)
--    {
--    case ALG_ID_MD5:
--        alg = GNUTLS_MAC_MD5;
--        break;
--    case ALG_ID_SHA1:
--        alg = GNUTLS_MAC_SHA1;
--        break;
--
--    case ALG_ID_SHA256:
--        alg = GNUTLS_MAC_SHA256;
--        break;
--
--    case ALG_ID_SHA384:
--        alg = GNUTLS_MAC_SHA384;
--        break;
--
--    case ALG_ID_SHA512:
--        alg = GNUTLS_MAC_SHA512;
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", hash->alg_id );
-+        ERR( "unhandled id %u\n", alg_id );
-         return STATUS_NOT_IMPLEMENTED;
-     }
- 
--    if (pgnutls_hmac_init( &hash->u.hmac_handle, alg, key, key_size )) return STATUS_INTERNAL_ERROR;
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size )
--{
--    if (pgnutls_hash( hash->u.hash_handle, input, size )) return STATUS_INTERNAL_ERROR;
-+    if (pgnutls_hash_init( &hash->hash_handle, alg )) return STATUS_INTERNAL_ERROR;
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hmac_update( struct hash *hash, UCHAR *input, ULONG size )
-+static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *input, ULONG size )
- {
--    if (pgnutls_hmac( hash->u.hmac_handle, input, size )) return STATUS_INTERNAL_ERROR;
-+    if (pgnutls_hash( hash->hash_handle, input, size )) return STATUS_INTERNAL_ERROR;
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size )
-+static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *output, ULONG size )
- {
--    pgnutls_hash_deinit( hash->u.hash_handle, output );
-+    pgnutls_hash_deinit( hash->hash_handle, output );
-     return STATUS_SUCCESS;
- }
- 
--static NTSTATUS hmac_finish( struct hash *hash, UCHAR *output, ULONG size )
--{
--    pgnutls_hmac_deinit( hash->u.hmac_handle, output );
--    return STATUS_SUCCESS;
--}
- #else
--struct hash
-+struct hash_impl
- {
--    struct object hdr;
--    BOOL hmac;
--    enum alg_id   alg_id;
--};
- 
--static NTSTATUS hash_init( struct hash *hash )
--{
--    ERR( "support for hashes not available at build time\n" );
--    return STATUS_NOT_IMPLEMENTED;
--}
--
--static NTSTATUS hmac_init( struct hash *hash, UCHAR *key, ULONG key_size )
--{
--    ERR( "support for hashes not available at build time\n" );
--    return STATUS_NOT_IMPLEMENTED;
--}
-+};
- 
--static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size )
-+static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
- {
-     ERR( "support for hashes not available at build time\n" );
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
--static NTSTATUS hmac_update( struct hash *hash, UCHAR *input, ULONG size )
-+static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *input, ULONG size )
- {
-     ERR( "support for hashes not available at build time\n" );
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
--static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size )
-+static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
-+                             UCHAR *output, ULONG size )
- {
-     ERR( "support for hashes not available at build time\n" );
-     return STATUS_NOT_IMPLEMENTED;
- }
-+#endif
- 
--static NTSTATUS hmac_finish( struct hash *hash, UCHAR *output, ULONG size )
-+struct hash
- {
--    ERR( "support for hashes not available at build time\n" );
--    return STATUS_NOT_IMPLEMENTED;
--}
--#endif
-+    struct object    hdr;
-+    enum alg_id      alg_id;
-+    BOOL hmac;
-+    struct hash_impl outer;
-+    struct hash_impl inner;
-+};
- 
- #ifdef _WIN64
- #define OBJECT_LENGTH_AES       654
-@@ -787,8 +687,11 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL
-                                   UCHAR *secret, ULONG secretlen, ULONG flags )
- {
-     struct algorithm *alg = algorithm;
-+    UCHAR buffer[MAX_HASH_BLOCK_BITS / 8];
-     struct hash *hash;
-+    int block_bytes;
-     NTSTATUS status;
-+    int i;
- 
-     TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen,
-            secret, secretlen, flags );
-@@ -806,17 +709,45 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL
-     hash->alg_id    = alg->id;
-     hash->hmac      = alg->hmac;
- 
--    if (hash->hmac)
-+    status = hash_init( &hash->inner, hash->alg_id );
-+    if (status || !hash->hmac) goto end;
-+    status = hash_init( &hash->outer, hash->alg_id );
-+    if (status) goto end;
-+
-+    /* reduce key size if too big */
-+    block_bytes = alg_block_bits[hash->alg_id] / 8;
-+    if (secretlen > block_bytes)
-     {
--        status = hmac_init( hash, secret, secretlen );
-+        struct hash_impl temp;
-+        status = hash_init( &temp, hash->alg_id );
-+        if (status) goto end;
-+        status = hash_update( &temp, hash->alg_id, secret, secretlen );
-+        if (status) goto end;
-+        memset( buffer, 0, block_bytes );
-+        status = hash_finish( &temp, hash->alg_id, buffer, alg_props[hash->alg_id].hash_length );
-+        if (status) goto end;
-     }
-     else
-     {
--        status = hash_init( hash );
-+        memset( buffer, 0, block_bytes );
-+        memcpy( buffer, secret, secretlen );
-     }
- 
-+    /* initialize outer hash */
-+    for (i = 0; i < block_bytes; i++)
-+        buffer[i] ^= 0x5c;
-+    status = hash_update( &hash->outer, hash->alg_id, buffer, block_bytes );
-+    if (status) goto end;
-+
-+    /* initialize inner hash */
-+    for (i = 0; i < block_bytes; i++)
-+        buffer[i] ^= (0x5c ^ 0x36);
-+    status = hash_update( &hash->inner, hash->alg_id, buffer, block_bytes );
-+
-+end:
-     if (status != STATUS_SUCCESS)
-     {
-+        /* FIXME: call hash_finish to release resources */
-         HeapFree( GetProcessHeap(), 0, hash );
-         return status;
-     }
-@@ -845,33 +776,33 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s
-     if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE;
-     if (!input) return STATUS_SUCCESS;
- 
--    if (hash->hmac)
--    {
--        return hmac_update( hash, input, size );
--    }
--    else
--    {
--        return hash_update( hash, input, size );
--    }
-+    return hash_update( &hash->inner, hash->alg_id, input, size );
- }
- 
- NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags )
- {
-+    UCHAR buffer[MAX_HASH_OUTPUT_BYTES];
-     struct hash *hash = handle;
-+    NTSTATUS status;
-+    int hash_size;
- 
-     TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags );
- 
-     if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE;
-     if (!output) return STATUS_INVALID_PARAMETER;
- 
--    if (hash->hmac)
--    {
--        return hmac_finish( hash, output, size );
--    }
--    else
--    {
--        return hash_finish( hash, output, size );
--    }
-+    if (!hash->hmac)
-+        return hash_finish( &hash->inner, hash->alg_id, output, size );
-+
-+    hash_size = alg_props[hash->alg_id].hash_length;
-+
-+    status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_size);
-+    if (status) return status;
-+
-+    status = hash_update( &hash->outer, hash->alg_id, buffer, hash_size);
-+    if (status) return status;
-+
-+    return hash_finish( &hash->outer, hash->alg_id, output, size);
- }
- 
- NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen,
--- 
-2.9.0
-

patches/bcrypt-Improvements/0004-bcrypt-Use-hash-fallback-implementation-as-default-a.patch

@@ -1,216 +0,0 @@
-From ae04ece5f64a29a67e187d5aa32c6b8d3e399d61 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 20 Dec 2016 02:39:26 +0100
-Subject: bcrypt: Use hash fallback implementation as default and remove gnutls
- / commoncrypto hash implemetation.
-
----
- dlls/bcrypt/bcrypt_main.c | 171 ----------------------------------------------
- 1 file changed, 171 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 9441cf0..3e2b22d 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -59,9 +59,6 @@ MAKE_FUNCPTR(gnutls_global_deinit);
- MAKE_FUNCPTR(gnutls_global_init);
- MAKE_FUNCPTR(gnutls_global_set_log_function);
- MAKE_FUNCPTR(gnutls_global_set_log_level);
--MAKE_FUNCPTR(gnutls_hash);
--MAKE_FUNCPTR(gnutls_hash_deinit);
--MAKE_FUNCPTR(gnutls_hash_init);
- MAKE_FUNCPTR(gnutls_perror);
- #undef MAKE_FUNCPTR
- 
-@@ -95,9 +92,6 @@ static BOOL gnutls_initialize(void)
-     LOAD_FUNCPTR(gnutls_global_init)
-     LOAD_FUNCPTR(gnutls_global_set_log_function)
-     LOAD_FUNCPTR(gnutls_global_set_log_level)
--    LOAD_FUNCPTR(gnutls_hash);
--    LOAD_FUNCPTR(gnutls_hash_deinit);
--    LOAD_FUNCPTR(gnutls_hash_init);
-     LOAD_FUNCPTR(gnutls_perror)
- #undef LOAD_FUNCPTR
- 
-@@ -299,170 +293,6 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled)
-     return STATUS_SUCCESS;
- }
- 
--#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
--struct hash_impl
--{
--    union
--    {
--        CC_MD5_CTX    md5_ctx;
--        CC_SHA1_CTX   sha1_ctx;
--        CC_SHA256_CTX sha256_ctx;
--        CC_SHA512_CTX sha512_ctx;
--    } u;
--};
--
--static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
--{
--    switch (alg_id)
--    {
--    case ALG_ID_MD5:
--        CC_MD5_Init( &hash->u.md5_ctx );
--        break;
--
--    case ALG_ID_SHA1:
--        CC_SHA1_Init( &hash->u.sha1_ctx );
--        break;
--
--    case ALG_ID_SHA256:
--        CC_SHA256_Init( &hash->u.sha256_ctx );
--        break;
--
--    case ALG_ID_SHA384:
--        CC_SHA384_Init( &hash->u.sha512_ctx );
--        break;
--
--    case ALG_ID_SHA512:
--        CC_SHA512_Init( &hash->u.sha512_ctx );
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", alg_id );
--        return STATUS_NOT_IMPLEMENTED;
--    }
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
--                             UCHAR *input, ULONG size )
--{
--    switch (alg_id)
--    {
--    case ALG_ID_MD5:
--        CC_MD5_Update( &hash->u.md5_ctx, input, size );
--        break;
--
--    case ALG_ID_SHA1:
--        CC_SHA1_Update( &hash->u.sha1_ctx, input, size );
--        break;
--
--    case ALG_ID_SHA256:
--        CC_SHA256_Update( &hash->u.sha256_ctx, input, size );
--        break;
--
--    case ALG_ID_SHA384:
--        CC_SHA384_Update( &hash->u.sha512_ctx, input, size );
--        break;
--
--    case ALG_ID_SHA512:
--        CC_SHA512_Update( &hash->u.sha512_ctx, input, size );
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", alg_id );
--        return STATUS_NOT_IMPLEMENTED;
--    }
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
--                             UCHAR *output, ULONG size )
--{
--    switch (alg_id)
--    {
--    case ALG_ID_MD5:
--        CC_MD5_Final( output, &hash->u.md5_ctx );
--        break;
--
--    case ALG_ID_SHA1:
--        CC_SHA1_Final( output, &hash->u.sha1_ctx );
--        break;
--
--    case ALG_ID_SHA256:
--        CC_SHA256_Final( output, &hash->u.sha256_ctx );
--        break;
--
--    case ALG_ID_SHA384:
--        CC_SHA384_Final( output, &hash->u.sha512_ctx );
--        break;
--
--    case ALG_ID_SHA512:
--        CC_SHA512_Final( output, &hash->u.sha512_ctx );
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", alg_id );
--        break;
--    }
--    return STATUS_SUCCESS;
--}
--
--#elif defined(HAVE_GNUTLS_HASH)
--struct hash_impl
--{
--    gnutls_hash_hd_t hash_handle;
--};
--
--static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id )
--{
--    gnutls_digest_algorithm_t alg;
--
--    if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
--
--    switch (alg_id)
--    {
--    case ALG_ID_MD5:
--        alg = GNUTLS_DIG_MD5;
--        break;
--    case ALG_ID_SHA1:
--        alg = GNUTLS_DIG_SHA1;
--        break;
--
--    case ALG_ID_SHA256:
--        alg = GNUTLS_DIG_SHA256;
--        break;
--
--    case ALG_ID_SHA384:
--        alg = GNUTLS_DIG_SHA384;
--        break;
--
--    case ALG_ID_SHA512:
--        alg = GNUTLS_DIG_SHA512;
--        break;
--
--    default:
--        ERR( "unhandled id %u\n", alg_id );
--        return STATUS_NOT_IMPLEMENTED;
--    }
--
--    if (pgnutls_hash_init( &hash->hash_handle, alg )) return STATUS_INTERNAL_ERROR;
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id,
--                             UCHAR *input, ULONG size )
--{
--    if (pgnutls_hash( hash->hash_handle, input, size )) return STATUS_INTERNAL_ERROR;
--    return STATUS_SUCCESS;
--}
--
--static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
--                             UCHAR *output, ULONG size )
--{
--    pgnutls_hash_deinit( hash->hash_handle, output );
--    return STATUS_SUCCESS;
--}
--
--#else
- struct hash_impl
- {
-     union
-@@ -572,7 +402,6 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id,
- 
-     return STATUS_SUCCESS;
- }
--#endif
- 
- struct hash
- {
--- 
-2.9.0
-

patches/bcrypt-Improvements/0005-bcrypt-Implement-BCryptDuplicateHash.patch

@@ -1,70 +0,0 @@
-From 3dc21336baced97a110773ac9e72db210a56af82 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 20 Dec 2016 03:59:19 +0100
-Subject: bcrypt: Implement BCryptDuplicateHash.
-
-FIXME: Should we check for NULL pointers?
----
- dlls/bcrypt/bcrypt.spec   |  2 +-
- dlls/bcrypt/bcrypt_main.c | 18 ++++++++++++++++++
- dlls/ncrypt/ncrypt.spec   |  2 +-
- 3 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 962953e509b..9ecd21d767c 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -11,7 +11,7 @@
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
- @ stub BCryptDestroySecret
--@ stub BCryptDuplicateHash
-+@ stdcall BCryptDuplicateHash(ptr ptr ptr long long)
- @ stub BCryptDuplicateKey
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long)
- @ stdcall BCryptEnumAlgorithms(long ptr ptr long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 4f09948096c..3eb0135b37c 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -672,6 +672,24 @@ end:
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HANDLE *handle_copy,
-+                                     UCHAR *object, ULONG object_count, ULONG flags )
-+{
-+    struct hash *hash_orig = handle;
-+    struct hash *hash_copy;
-+
-+    TRACE( "%p, %p, %p, %u, %u\n", handle, handle_copy, object, object_count, flags );
-+
-+    if (!hash_orig || hash_orig->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE;
-+    if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) )))
-+        return STATUS_NO_MEMORY;
-+
-+    memcpy( hash_copy, hash_orig, sizeof(*hash_orig) );
-+
-+    *handle_copy = hash_copy;
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle )
- {
-     struct hash *hash = handle;
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index 60b7eb37075..1a78853bf49 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -13,7 +13,7 @@
- @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash
- @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey
- @ stub BCryptDestroySecret
--@ stub BCryptDuplicateHash
-+@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash
- @ stub BCryptDuplicateKey
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt
- @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms
--- 
-2.11.0
-

patches/bcrypt-Improvements/0009-bcrypt-Handle-NULL-pointers-in-BCryptDuplicateHash-a.patch

@@ -1,83 +0,0 @@
-From 873d431347aa25effc70e47566e562c122a5edc8 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 26 Dec 2016 04:23:31 +0100
-Subject: bcrypt: Handle NULL pointers in BCryptDuplicateHash and add tests.
-
----
- dlls/bcrypt/bcrypt_main.c  |  1 +
- dlls/bcrypt/tests/bcrypt.c | 26 +++++++++++++++++++++++++-
- 2 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index a9006a4..d1516cc 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -681,6 +681,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND
-     TRACE( "%p, %p, %p, %u, %u\n", handle, handle_copy, object, object_count, flags );
- 
-     if (!hash_orig || hash_orig->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE;
-+    if (!handle_copy) return STATUS_INVALID_PARAMETER;
-     if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) )))
-         return STATUS_NO_MEMORY;
- 
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 997b298..bfe3a7e 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -33,6 +33,7 @@ static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDL
-                                             ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptHash)(BCRYPT_ALG_HANDLE, UCHAR *, ULONG, UCHAR *, ULONG, UCHAR *, ULONG);
- static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
-+static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE);
- static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
-@@ -173,7 +174,7 @@ static void test_sha1(void)
-     static const char expected[] = "961fa64958818f767707072755d7018dcd278e94";
-     static const char expected_hmac[] = "2472cf65d0e090618d769d3e46f0d9446cf212da";
-     BCRYPT_ALG_HANDLE alg;
--    BCRYPT_HASH_HANDLE hash;
-+    BCRYPT_HASH_HANDLE hash, hash2;
-     UCHAR buf[512], buf_hmac[1024], sha1[20], sha1_hmac[20];
-     ULONG size, len;
-     char str[41];
-@@ -260,6 +261,28 @@ static void test_sha1(void)
-     test_hash_length(hash, 20);
-     test_alg_name(hash, "SHA1");
- 
-+    ret = pBCryptDuplicateHash(NULL, &hash2, NULL, 0, 0);
-+    ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret);
-+
-+    ret = pBCryptDuplicateHash(hash, NULL, NULL, 0, 0);
-+    ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
-+
-+    hash2 = (void *)0xdeadbeef;
-+    ret = pBCryptDuplicateHash(hash, &hash2, NULL, 0, 0);
-+    ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < Win 7 */, "got %08x\n", ret);
-+
-+    if (ret == STATUS_SUCCESS)
-+    {
-+        memset(sha1_hmac, 0, sizeof(sha1_hmac));
-+        ret = pBCryptFinishHash(hash2, sha1_hmac, sizeof(sha1_hmac), 0);
-+        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+        format_hash( sha1_hmac, sizeof(sha1_hmac), str );
-+        ok(!strcmp(str, expected_hmac), "got %s\n", str);
-+
-+        ret = pBCryptDestroyHash(hash2);
-+        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    }
-+
-     memset(sha1_hmac, 0, sizeof(sha1_hmac));
-     ret = pBCryptFinishHash(hash, sha1_hmac, sizeof(sha1_hmac), 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-@@ -1179,6 +1202,7 @@ START_TEST(bcrypt)
-     pBCryptCreateHash = (void *)GetProcAddress(module, "BCryptCreateHash");
-     pBCryptHash = (void *)GetProcAddress(module, "BCryptHash");
-     pBCryptHashData = (void *)GetProcAddress(module, "BCryptHashData");
-+    pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash");
-     pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash");
-     pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash");
-     pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom");
--- 
-2.9.0
-

patches/bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch

@@ -1,17 +1,17 @@
-From 9f68ea60cf840c9366aefe1ab486e9d1ee192843 Mon Sep 17 00:00:00 2001
+From a93745453350f9eabcab0f49528c3f027a303c24 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 26 Dec 2016 06:18:01 +0100
 Subject: bcrypt: Pass object to get_{alg,hash}_property instead of alg_id.
 
 ---
- dlls/bcrypt/bcrypt_main.c | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
+ dlls/bcrypt/bcrypt_main.c | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index d1516cc..8a5161b 100644
+index d0a1b074b50..deab6f28bd9 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -450,16 +450,16 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *
+@@ -440,15 +440,15 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *
      return STATUS_NOT_IMPLEMENTED;
  }
  
@@ -19,7 +19,6 @@ index d1516cc..8a5161b 100644
 +static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
  {
      NTSTATUS status;
-     ULONG value;
  
 -    status = generic_alg_property( id, prop, buf, size, ret_size );
 +    status = generic_alg_property( alg->id, prop, buf, size, ret_size );
@@ -31,17 +30,8 @@ index d1516cc..8a5161b 100644
      {
      case ALG_ID_AES:
          if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH ))
-@@ -540,7 +540,7 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf,
-         return STATUS_NOT_IMPLEMENTED;
- 
-     default:
--        FIXME( "unsupported algorithm %u\n", id );
-+        FIXME( "unsupported algorithm %u\n", alg->id );
-         return STATUS_NOT_IMPLEMENTED;
-     }
- 
-@@ -555,11 +555,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf,
-     return STATUS_SUCCESS;
+@@ -484,11 +484,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf,
+     return STATUS_NOT_IMPLEMENTED;
  }
  
 -static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
@@ -54,7 +44,7 @@ index d1516cc..8a5161b 100644
      if (status == STATUS_NOT_IMPLEMENTED)
          FIXME( "unsupported property %s\n", debugstr_w(prop) );
      return status;
-@@ -579,12 +579,12 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
+@@ -508,12 +508,12 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
      case MAGIC_ALG:
      {
          const struct algorithm *alg = (const struct algorithm *)object;
@@ -69,7 +59,7 @@ index d1516cc..8a5161b 100644
      }
      default:
          WARN( "unknown magic %08x\n", object->magic );
-@@ -783,34 +783,34 @@ struct key
+@@ -697,34 +697,34 @@ struct key
      ULONG              secret_len;
  };
  
@@ -110,7 +100,7 @@ index d1516cc..8a5161b 100644
      key->handle     = 0;        /* initialized on first use */
      key->secret     = buffer;
      key->secret_len = secret_len;
-@@ -906,7 +906,7 @@ struct key
+@@ -820,7 +820,7 @@ struct key
      ULONG         block_size;
  };
  
@@ -119,7 +109,7 @@ index d1516cc..8a5161b 100644
  {
      ERR( "support for keys not available at build time\n" );
      return STATUS_NOT_IMPLEMENTED;
-@@ -955,7 +955,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_
+@@ -869,7 +869,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_
      if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) return STATUS_NO_MEMORY;
      key->hdr.magic = MAGIC_KEY;
  
@@ -129,5 +119,5 @@ index d1516cc..8a5161b 100644
          HeapFree( GetProcessHeap(), 0, key );
          return status;
 -- 
-2.9.0
+2.11.0
 

patches/bcrypt-Improvements/0013-bcrypt-Implement-BCryptSetProperty-for-algorithms.patch

@@ -1,4 +1,4 @@
-From 5313398cdabe97a17b21e2d9f25a191da7bd9434 Mon Sep 17 00:00:00 2001
+From 2f57d906c55bdc99f476b6547f67d864e7210f16 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Dec 2016 06:08:33 +0100
 Subject: bcrypt: Implement BCryptSetProperty for algorithms.
@@ -9,7 +9,7 @@ Subject: bcrypt: Implement BCryptSetProperty for algorithms.
  2 files changed, 67 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 8a5161b..4757878 100644
+index deab6f28bd9..595d36d7dbe 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
 @@ -153,6 +153,12 @@ enum alg_id
@@ -23,9 +23,9 @@ index 8a5161b..4757878 100644
 +};
 +
  #define MAX_HASH_OUTPUT_BYTES 64
+ #define MAX_HASH_BLOCK_BITS 1024
  
- static const struct {
-@@ -172,6 +178,7 @@ struct algorithm
+@@ -175,6 +181,7 @@ struct algorithm
  {
      struct object hdr;
      enum alg_id   id;
@@ -33,7 +33,7 @@ index 8a5161b..4757878 100644
      BOOL hmac;
  };
  
-@@ -265,6 +272,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
+@@ -255,6 +262,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
      if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY;
      alg->hdr.magic = MAGIC_ALG;
      alg->id        = alg_id;
@@ -41,8 +41,8 @@ index 8a5161b..4757878 100644
      alg->hmac      = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG;
  
      *handle = alg;
-@@ -555,6 +563,40 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
-     return STATUS_SUCCESS;
+@@ -484,6 +492,40 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
+     return STATUS_NOT_IMPLEMENTED;
  }
  
 +static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
@@ -82,7 +82,7 @@ index 8a5161b..4757878 100644
  static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
  {
      NTSTATUS status;
-@@ -595,8 +637,28 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
+@@ -524,8 +566,28 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
  NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value,
                                     ULONG size, ULONG flags )
  {
@@ -114,10 +114,10 @@ index 8a5161b..4757878 100644
  
  NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen,
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 699a995..d850738 100644
+index abf59c8404d..08a83aaf7a5 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -889,7 +889,7 @@ static void test_BCryptGenerateSymmetricKey(void)
+@@ -776,7 +776,7 @@ static void test_BCryptGenerateSymmetricKey(void)
  
      ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC,
                              sizeof(BCRYPT_CHAIN_MODE_CBC), 0);
@@ -126,7 +126,7 @@ index 699a995..d850738 100644
  
      size = 0xdeadbeef;
      ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0);
-@@ -1078,7 +1078,7 @@ static void test_BCryptEncrypt(void)
+@@ -965,7 +965,7 @@ static void test_BCryptEncrypt(void)
      todo_wine ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret);
  
      ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0);
@@ -135,7 +135,7 @@ index 699a995..d850738 100644
  
      size = 0;
      ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
-@@ -1306,7 +1306,7 @@ static void test_BCryptDecrypt(void)
+@@ -1193,7 +1193,7 @@ static void test_BCryptDecrypt(void)
       ******************/
  
      ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0);
@@ -145,5 +145,5 @@ index 699a995..d850738 100644
      buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
      ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
 -- 
-2.9.0
+2.11.0
 

patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch

@@ -1,4 +1,4 @@
-From f7749755c11e54d1e75cd05b6656d2c474ade8ae Mon Sep 17 00:00:00 2001
+From 6de382845ffbb12d514a0ece9483a72b34df852e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Dec 2016 06:46:11 +0100
 Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
@@ -9,10 +9,10 @@ Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
  2 files changed, 11 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 4757878..24dee8b 100644
+index 595d36d7dbe..3ab80a1a31a 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -482,17 +482,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
+@@ -470,17 +470,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
          }
          if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
          {
@@ -38,13 +38,13 @@ index 4757878..24dee8b 100644
 +            memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) );
 +            return STATUS_SUCCESS;
          }
-         FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) );
-         return STATUS_NOT_IMPLEMENTED;
+         break;
+ 
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index d850738..bbf18c4 100644
+index 08a83aaf7a5..1a5523726dd 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -842,7 +842,7 @@ static void test_aes(void)
+@@ -729,7 +729,7 @@ static void test_aes(void)
  
      size = 0;
      ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0);
@@ -54,5 +54,5 @@ index d850738..bbf18c4 100644
  
      size = 0;
 -- 
-2.9.0
+2.11.0
 

patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch

@@ -1,4 +1,4 @@
-From 017f5d467e537e5159f9c14f703df97661a1453e Mon Sep 17 00:00:00 2001
+From 5f7f79f4ae52f87eeaaa04617a7cd9289dd655b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Dec 2016 06:50:28 +0100
 Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
@@ -9,10 +9,10 @@ Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
  2 files changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 24dee8b..dc5c798 100644
+index 3ab80a1a31a..0a990158361 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -495,6 +495,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
+@@ -483,6 +483,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
              memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) );
              return STATUS_SUCCESS;
          }
@@ -30,14 +30,14 @@ index 24dee8b..dc5c798 100644
 +            }
 +            return STATUS_SUCCESS;
 +        }
-         FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) );
-         return STATUS_NOT_IMPLEMENTED;
+         break;
  
+     default:
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index bbf18c4..513d11f 100644
+index 1a5523726dd..50340566093 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -1075,24 +1075,24 @@ static void test_BCryptEncrypt(void)
+@@ -962,24 +962,24 @@ static void test_BCryptEncrypt(void)
  
      size = 0;
      ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
@@ -71,5 +71,5 @@ index bbf18c4..513d11f 100644
      len = 0xdeadbeef;
      size = sizeof(len);
 -- 
-2.9.0
+2.11.0
 

patches/bcrypt-Improvements/0022-bcrypt-Allow-to-call-BCryptSetProperty-on-key-object.patch

@@ -1,4 +1,4 @@
-From 85c7ad0c67aa6cc57e93f2160922305f80d49b4c Mon Sep 17 00:00:00 2001
+From bdebe07119a6ab2d3d3ba87f1d31ab0c4d998417 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Dec 2016 08:41:31 +0100
 Subject: bcrypt: Allow to call BCryptSetProperty on key objects.
@@ -9,11 +9,11 @@ Subject: bcrypt: Allow to call BCryptSetProperty on key objects.
  2 files changed, 40 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index a07250e..3638c77 100644
+index 5ca0c85e9ee..75b9765a602 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -215,6 +215,9 @@ int alg_block_bits[] =
-     /* ALG_ID_SHA512 */ 1024
+@@ -204,6 +204,9 @@ struct algorithm
+     BOOL hmac;
  };
  
 +struct key;
@@ -22,7 +22,7 @@ index a07250e..3638c77 100644
  NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags)
  {
      const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG;
-@@ -685,8 +688,8 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
+@@ -671,8 +674,8 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
      }
      case MAGIC_KEY:
      {
@@ -33,7 +33,7 @@ index a07250e..3638c77 100644
      }
      default:
          WARN( "unknown magic %08x\n", object->magic );
-@@ -933,6 +936,31 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
+@@ -903,6 +906,31 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
      return STATUS_SUCCESS;
  }
  
@@ -65,7 +65,7 @@ index a07250e..3638c77 100644
  static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
  {
      switch (key->alg_id)
-@@ -1050,6 +1078,12 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
+@@ -1023,6 +1051,12 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
      return STATUS_NOT_IMPLEMENTED;
  }
  
@@ -79,10 +79,10 @@ index a07250e..3638c77 100644
  {
      ERR( "support for keys not available at build time\n" );
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index a55d9a9..62f0ca7 100644
+index f458ab5ce56..e00245556f4 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -903,6 +903,10 @@ static void test_BCryptGenerateSymmetricKey(void)
+@@ -889,6 +889,10 @@ static void test_BCryptGenerateSymmetricKey(void)
                              sizeof(BCRYPT_CHAIN_MODE_CBC), 0);
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
  
@@ -94,5 +94,5 @@ index a55d9a9..62f0ca7 100644
      ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0);
      ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
 -- 
-2.9.0
+2.11.0
 

patches/bcrypt-Improvements/definition

@@ -1,3 +1,2 @@
-Fixes: [41951] Implement bcrypt.BCryptDuplicateHash
 Fixes: [40418] Implement BCrypt AES provider
 Fixes: [42553] Implement BCrypt ECB chaining mode

patches/cabinet-iFolder/0001-cabinet-Set-index-of-folder-in-FDICopy-callback.patch

@@ -1,32 +0,0 @@
-From d98a585a7d809889d84a45546d7d259a9ab35356 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 27 Oct 2016 01:33:34 +0200
-Subject: cabinet: Set index of folder in FDICopy callback.
-
----
- dlls/cabinet/fdi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
-index fdff0bf..758133e 100644
---- a/dlls/cabinet/fdi.c
-+++ b/dlls/cabinet/fdi.c
-@@ -2640,6 +2640,7 @@ BOOL __cdecl FDICopy(
-       fdin.date = file->date;
-       fdin.time = file->time;
-       fdin.attribs = file->attribs;
-+      fdin.iFolder = file->index;
-       if ((filehf = ((*pfnfdin)(fdintCOPY_FILE, &fdin))) == -1) {
-         set_error( fdi, FDIERROR_USER_ABORT, 0 );
-         filehf = 0;
-@@ -2765,6 +2766,7 @@ BOOL __cdecl FDICopy(
-       fdin.date = file->date;
-       fdin.time = file->time;
-       fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */
-+      fdin.iFolder = file->index;
-       ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin));
-       filehf = 0;
- 
--- 
-2.9.0
-

patches/cabinet-iFolder/definition

@@ -1 +0,0 @@
-Fixes: [10858] Set index of folder in FDICopy callback

patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch

@@ -1,4 +1,4 @@
-From 29ccadcb0e716255ac5e43b8784d129f3fc2a441 Mon Sep 17 00:00:00 2001
+From caafb5926a24065e96350fc255ea92c0863c2730 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 19 Dec 2014 22:31:46 +0100
 Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@@ -9,7 +9,7 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
  2 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index 7772406..00c486c 100644
+index 42f5aea966b..7c1d1787bf1 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
 @@ -3538,13 +3538,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -58,10 +58,10 @@ index 7772406..00c486c 100644
  
  static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
 diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 41db494..efc991e 100644
+index 56d9fe627be..1b9bea6a55c 100644
 --- a/dlls/d3dx9_36/tests/effect.c
 +++ b/dlls/d3dx9_36/tests/effect.c
-@@ -4275,6 +4275,65 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device)
+@@ -4413,6 +4413,65 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device)
      effect->lpVtbl->Release(effect);
  }
  
@@ -127,14 +127,14 @@ index 41db494..efc991e 100644
  START_TEST(effect)
  {
      HWND wnd;
-@@ -4318,6 +4377,7 @@ START_TEST(effect)
-     test_effect_preshader(device);
+@@ -4457,6 +4516,7 @@ START_TEST(effect)
      test_effect_preshader_ops(device);
      test_effect_isparameterused(device);
+     test_effect_out_of_bounds_selector(device);
 +    test_effect_technique_validation(device);
  
      count = IDirect3DDevice9_Release(device);
      ok(count == 0, "The device was not properly freed: refcount %u\n", count);
 -- 
-2.8.0
+2.11.0
 

patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch

@@ -1,4 +1,4 @@
-From 336cf41969e853ca0044261f00ed55ac6f668ff1 Mon Sep 17 00:00:00 2001
+From 93267b9dc171775f908aa0f0dde65cc5a60c3b0b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Mar 2016 22:22:42 +0100
 Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@@ -12,7 +12,7 @@ Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
  5 files changed, 106 insertions(+)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index fb91722943e..4b9d9fbf876 100644
+index 8a33ccd4c7..3330b9ce32 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
 @@ -1554,6 +1554,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -25,10 +25,10 @@ index fb91722943e..4b9d9fbf876 100644
  
      if(DriverCaps)
 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
-index 278b9c60069..e1a7a1a4d1c 100644
+index 4f53ee1059..538ab656e3 100644
 --- a/dlls/ddraw/tests/ddraw1.c
 +++ b/dlls/ddraw/tests/ddraw1.c
-@@ -10163,6 +10163,31 @@ static void test_texture_load(void)
+@@ -10683,6 +10683,31 @@ done:
      DestroyWindow(window);
  }
  
@@ -60,18 +60,18 @@ index 278b9c60069..e1a7a1a4d1c 100644
  START_TEST(ddraw1)
  {
      IDirectDraw *ddraw;
-@@ -10249,4 +10274,5 @@ START_TEST(ddraw1)
-     test_display_mode_surface_pixel_format();
+@@ -10770,4 +10795,5 @@ START_TEST(ddraw1)
      test_surface_desc_size();
      test_texture_load();
+     test_ck_operation();
 +    test_caps();
  }
 diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
-index db09e5d8975..53279059105 100644
+index be950d8034..b72fffb51e 100644
 --- a/dlls/ddraw/tests/ddraw2.c
 +++ b/dlls/ddraw/tests/ddraw2.c
-@@ -11487,6 +11487,31 @@ static void test_surface_desc_size(void)
-     ok(!refcount, "DirectDraw has %u references left.\n", refcount);
+@@ -12021,6 +12021,31 @@ done:
+     DestroyWindow(window);
  }
  
 +static void test_caps(void)
@@ -102,17 +102,17 @@ index db09e5d8975..53279059105 100644
  START_TEST(ddraw2)
  {
      IDirectDraw2 *ddraw;
-@@ -11581,4 +11606,5 @@ START_TEST(ddraw2)
-     test_transform_vertices();
+@@ -12116,4 +12141,5 @@ START_TEST(ddraw2)
      test_display_mode_surface_pixel_format();
      test_surface_desc_size();
+     test_ck_operation();
 +    test_caps();
  }
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index 830da89bba2..7ba77be3406 100644
+index 2f92a70f4c..1381b498de 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
-@@ -12885,6 +12885,31 @@ static void test_get_surface_from_dc(void)
+@@ -13551,6 +13551,31 @@ static void test_compute_sphere_visibility(void)
      DestroyWindow(window);
  }
  
@@ -144,17 +144,17 @@ index 830da89bba2..7ba77be3406 100644
  START_TEST(ddraw4)
  {
      IDirectDraw4 *ddraw;
-@@ -12988,4 +13013,5 @@ START_TEST(ddraw4)
-     test_display_mode_surface_pixel_format();
-     test_surface_desc_size();
-     test_get_surface_from_dc();
+@@ -13657,4 +13682,5 @@ START_TEST(ddraw4)
+     test_ck_operation();
+     test_vb_refcount();
+     test_compute_sphere_visibility();
 +    test_caps();
  }
 diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index ba0e4a96e0f..be70456555e 100644
+index 29dd246d91..206c90ca3d 100644
 --- a/dlls/ddraw/tests/ddraw7.c
 +++ b/dlls/ddraw/tests/ddraw7.c
-@@ -12576,6 +12576,31 @@ static void test_get_surface_from_dc(void)
+@@ -13251,6 +13251,31 @@ static void test_compute_sphere_visibility(void)
      DestroyWindow(window);
  }
  
@@ -186,10 +186,10 @@ index ba0e4a96e0f..be70456555e 100644
  START_TEST(ddraw7)
  {
      HMODULE module = GetModuleHandleA("ddraw.dll");
-@@ -12689,4 +12714,5 @@ START_TEST(ddraw7)
-     test_display_mode_surface_pixel_format();
-     test_surface_desc_size();
-     test_get_surface_from_dc();
+@@ -13367,4 +13392,5 @@ START_TEST(ddraw7)
+     test_ck_operation();
+     test_vb_refcount();
+     test_compute_sphere_visibility();
 +    test_caps();
  }
 -- 

patches/ddraw-Silence_FIXMEs/0001-ddraw-Silence-noisy-FIXME-about-unimplemented-D3DPRO.patch

@@ -0,0 +1,29 @@
+From ff117878cb3a0c74a50355ca64ac36c5fe6cee67 Mon Sep 17 00:00:00 2001
+From: Christian Costa <titan.costa@gmail.com>
+Date: Fri, 10 Mar 2017 22:07:37 +0100
+Subject: ddraw: Silence noisy FIXME about unimplemented
+ D3DPROCESSVERTICES_UPDATEEXTENTS.
+
+---
+ dlls/ddraw/executebuffer.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
+index 393c52c1e2..9b64c687d3 100644
+--- a/dlls/ddraw/executebuffer.c
++++ b/dlls/ddraw/executebuffer.c
+@@ -302,7 +302,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
+                             ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags);
+ 
+                     if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
+-                        FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
++                    {
++                        static int once;
++                        if (!once++) FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
++                    }
+                     if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
+                         FIXME("D3DPROCESSVERTICES_NOCOLOR not implemented.\n");
+ 
+-- 
+2.11.0
+

patches/gdi32-GetCharacterPlacement/0001-gdi32-Treat-lpResults-as-optional-in-GetCharacterPla.patch

@@ -0,0 +1,97 @@
+From 1f4a7bc3ed8ede33a6e623bf49067550cee433d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 19 Mar 2017 15:52:42 +0100
+Subject: gdi32: Treat lpResults as optional in GetCharacterPlacement.
+
+---
+ dlls/gdi32/font.c       | 13 ++++++++++++-
+ dlls/gdi32/tests/font.c | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
+index ddd0051ab6..fcc24d8645 100644
+--- a/dlls/gdi32/font.c
++++ b/dlls/gdi32/font.c
+@@ -3201,10 +3201,18 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount,
+     TRACE("%s, %d, %d, 0x%08x\n",
+           debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags);
+ 
++    lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp);
++
++    if (!lpResults)
++    {
++        ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags);
++        HeapFree(GetProcessHeap(), 0, lpStringW);
++        return ret;
++    }
++
+     /* both structs are equal in size */
+     memcpy(&resultsW, lpResults, sizeof(resultsW));
+ 
+-    lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp);
+     if(lpResults->lpOutString)
+         resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW);
+ 
+@@ -3259,6 +3267,9 @@ GetCharacterPlacementW(
+     TRACE("%s, %d, %d, 0x%08x\n",
+           debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags);
+ 
++    if (!lpResults)
++        return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0;
++
+     TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
+           "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n",
+           lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder,
+diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
+index fb27f8e005..974b471462 100644
+--- a/dlls/gdi32/tests/font.c
++++ b/dlls/gdi32/tests/font.c
+@@ -4910,6 +4910,37 @@ static void test_GetTextMetrics2(const char *fontname, int font_height)
+     ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio);
+ }
+ 
++static void test_GetCharacterPlacement(void)
++{
++    GCP_RESULTSA result;
++    DWORD size, size2;
++    WCHAR glyphs[20];
++    HDC hdc;
++
++    hdc = CreateCompatibleDC(0);
++    ok(!!hdc, "CreateCompatibleDC failed\n");
++
++    memset(&result, 0, sizeof(result));
++    result.lStructSize = sizeof(result);
++    result.lpGlyphs = glyphs;
++    result.nGlyphs  = 20;
++
++    size = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, &result, 0);
++    ok(size, "GetCharacterPlacementA failed!\n");
++
++    size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0);
++    ok(size2, "GetCharacterPlacementA failed!\n");
++    ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size);
++
++    size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, NULL, GCP_REORDER);
++    ok(size2, "GetCharacterPlacementA failed!\n");
++    ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size);
++
++    size = GetCharacterPlacementA(hdc, "Wine Test", 9, 1024, &result, GCP_REORDER);
++    ok(size, "GetCharacterPlacementA failed!\n");
++    ok(size == size2, "GetCharacterPlacementA returned different result: %u vs %u\n", size2, size);
++}
++
+ static void test_CreateFontIndirect(void)
+ {
+     LOGFONTA lf, getobj_lf;
+@@ -6682,6 +6713,7 @@ START_TEST(font)
+     test_GetTextMetrics2("Arial", -11);
+     test_GetTextMetrics2("Arial", -55);
+     test_GetTextMetrics2("Arial", -110);
++    test_GetCharacterPlacement();
+     test_CreateFontIndirect();
+     test_CreateFontIndirectEx();
+     test_oemcharset();
+-- 
+2.11.0
+

patches/gdi32-GetCharacterPlacement/definition

@@ -0,0 +1 @@
+Fixes: [42669] Treat lpResults as optional in gdi32.GetCharacterPlacement