Release v3.6

This will at least hold us off until someone forces a real solution.

patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch

@@ -1,42 +0,0 @@
-From b0a0388503a1576fb9b1b91ca764251b30f7dd3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 20 Jul 2014 22:22:14 +0200
-Subject: wined3d: allow changing strict drawing through an exported function
-
----
- dlls/wined3d/wined3d.spec   | 2 ++
- dlls/wined3d/wined3d_main.c | 5 +++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index bbd2fb5..2fd0c0e 100644
---- a/dlls/wined3d/wined3d.spec
-+++ b/dlls/wined3d/wined3d.spec
-@@ -220,6 +220,8 @@
- @ cdecl wined3d_stateblock_decref(ptr)
- @ cdecl wined3d_stateblock_incref(ptr)
- 
-+@ cdecl wined3d_strictdrawing_set(long)
-+
- @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr)
- @ cdecl wined3d_swapchain_decref(ptr)
- @ cdecl wined3d_swapchain_get_back_buffer(ptr long)
-diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
-index 0543d97..6a62697 100644
---- a/dlls/wined3d/wined3d_main.c
-+++ b/dlls/wined3d/wined3d_main.c
-@@ -515,6 +515,11 @@ void wined3d_unregister_window(HWND window)
-     wined3d_wndproc_mutex_unlock();
- }
- 
-+void CDECL wined3d_strictdrawing_set(int value)
-+{
-+    wined3d_settings.strict_draw_ordering = value;
-+}
-+
- /* At process attach */
- BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
- {
--- 
-2.7.1
-

patches/advapi32-WinBuiltinAnyPackageSid/0002-advapi32-tests-Add-a-test-that-compares-a-well-known.patch

@@ -152,7 +152,7 @@ index dfe2f871d42..808547ddbc0 100644
  
 +    AllocateAndInitializeSid(&domain_ident, 4, SECURITY_NT_NON_UNIQUE, 0, 0, 0, 0, 0, 0, 0, &domain_sid);
 +
-     for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++)
+     for(i = 0; i < ARRAY_SIZE(strsid_table); i++)
      {
 -        char *temp;
 -

patches/avifil32-AVIFile_Proxies/0001-avifil32-Add-support-for-AVIFile-interface-proxies.-.patch

@@ -1,239 +0,0 @@
-From a33160eef805e950e8b3c36c74f0688ca9e2328e Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Sun, 7 Feb 2016 12:52:26 +0800
-Subject: avifil32: Add support for AVIFile interface proxies. [v2]
-
----
- dlls/avifil32/Makefile.in        |   4 +-
- dlls/avifil32/avifil32.idl       |  25 ++++++----
- dlls/avifil32/avifile_ifaces.idl | 105 +++++++++++++++++++++++++++++++++++++++
- dlls/avifil32/avifile_private.h  |   1 +
- dlls/avifil32/factory.c          |   8 ++-
- 5 files changed, 130 insertions(+), 13 deletions(-)
- create mode 100644 dlls/avifil32/avifile_ifaces.idl
-
-diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
-index 81d2ff8..4030514 100644
---- a/dlls/avifil32/Makefile.in
-+++ b/dlls/avifil32/Makefile.in
-@@ -1,6 +1,6 @@
- MODULE    = avifil32.dll
- IMPORTLIB = avifil32
--IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32
-+IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
- 
- C_SRCS = \
- 	acmstream.c \
-@@ -17,3 +17,5 @@ C_SRCS = \
- IDL_SRCS = avifil32.idl
- 
- RC_SRCS = avifil32.rc
-+
-+dlldata_EXTRADEFS = -DENTRY_PREFIX=avifil32_
-diff --git a/dlls/avifil32/avifil32.idl b/dlls/avifil32/avifil32.idl
-index 1f50f15..e23c176 100644
---- a/dlls/avifil32/avifil32.idl
-+++ b/dlls/avifil32/avifil32.idl
-@@ -18,39 +18,42 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#pragma makedep proxy
- #pragma makedep register
- 
-+#include "avifile_ifaces.idl"
-+
-+[
-+    helpstring("IAVIStream & IAVIFile Proxy"),
-+    threading(both),
-+    uuid(0002000d-0000-0000-c000-000000000046)
-+]
-+coclass PSFactoryBuffer { interface IFactoryBuffer; }
-+
- [
-     helpstring("Microsoft AVI Files"),
--    threading(apartment),
-+    threading(both),
-     uuid(00020000-0000-0000-C000-000000000046)
- ]
- coclass AVIFile { interface IAVIFile; }
- 
- [
-     helpstring("AVI Compressed Stream"),
--    threading(apartment),
-+    threading(both),
-     uuid(00020001-0000-0000-c000-000000000046)
- ]
- coclass ICMStream { interface IAVIStream; }
- 
- [
-     helpstring("Microsoft Wave File"),
--    threading(apartment),
-+    threading(both),
-     uuid(00020003-0000-0000-c000-000000000046)
- ]
- coclass WAVFile { interface IAVIFile; }
- 
- [
--    helpstring("IAVIStream & IAVIFile Proxy"),
--    threading(apartment),
--    uuid(0002000d-0000-0000-c000-000000000046)
--]
--coclass AVIProxy { }
--
--[
-     helpstring("ACM Compressed Audio Stream"),
--    threading(apartment),
-+    threading(both),
-     uuid(0002000f-0000-0000-c000-000000000046)
- ]
- coclass ACMStream { interface IAVIStream; }
-diff --git a/dlls/avifil32/avifile_ifaces.idl b/dlls/avifil32/avifile_ifaces.idl
-new file mode 100644
-index 0000000..f9280e5
---- /dev/null
-+++ b/dlls/avifil32/avifile_ifaces.idl
-@@ -0,0 +1,105 @@
-+/*
-+ * Proxy support for avifil32
-+ *
-+ * Copyright 2016 Dmitry Timoshkov
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+/*
-+ * These interface descriptions are supposed to be used for automatic proxy
-+ * generation by an IDL compiler.
-+ *
-+ * While it's possible to convert include/vfw.h to an .idl, that's proved to
-+ * be a major waste of an effort because the resulting interface descriptions
-+ * can't be used for automatic proxy generation since they are not compatible
-+ * with IDL compiler restrictions for proxies, and fixing them up would make
-+ * generated vfw.h source incompatible with PSDK's equivalent.
-+ */
-+
-+import "wtypes.idl";
-+import "unknwn.idl";
-+
-+typedef struct _AVISTREAMINFOW
-+{
-+    DWORD fccType;
-+    DWORD fccHandler;
-+    DWORD dwFlags;
-+    DWORD dwCaps;
-+    WORD  wPriority;
-+    WORD  wLanguage;
-+    DWORD dwScale;
-+    DWORD dwRate;
-+    DWORD dwStart;
-+    DWORD dwLength;
-+    DWORD dwInitialFrames;
-+    DWORD dwSuggestedBufferSize;
-+    DWORD dwQuality;
-+    DWORD dwSampleSize;
-+    RECT  rcFrame;
-+    DWORD dwEditCount;
-+    DWORD dwFormatChangeCount;
-+    WCHAR szName[64];
-+} AVISTREAMINFOW;
-+
-+[
-+    object,
-+    uuid(00020021-0000-0000-c000-000000000046)
-+]
-+interface IAVIStream : IUnknown
-+{
-+    HRESULT Create(LPARAM lParam1, LPARAM lParam2);
-+    HRESULT Info(AVISTREAMINFOW *psi, LONG lSize);
-+    LONG FindSample(LONG lPos, LONG lFlags);
-+    HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat);
-+    HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat);
-+    HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples);
-+    HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten);
-+    HRESULT Delete(LONG lStart, LONG lSamples);
-+    HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer);
-+    HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer);
-+    HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo);
-+};
-+
-+typedef struct _AVIFILEINFOW
-+{
-+    DWORD dwMaxBytesPerSec;
-+    DWORD dwFlags;
-+    DWORD dwCaps;
-+    DWORD dwStreams;
-+    DWORD dwSuggestedBufferSize;
-+    DWORD dwWidth;
-+    DWORD dwHeight;
-+    DWORD dwScale;
-+    DWORD dwRate;
-+    DWORD dwLength;
-+    DWORD dwEditCount;
-+    WCHAR szFileType[64];
-+} AVIFILEINFOW;
-+
-+[
-+    object,
-+    uuid(00020020-0000-0000-c000-000000000046)
-+]
-+interface IAVIFile : IUnknown
-+{
-+    HRESULT Info(AVIFILEINFOW *pfi, LONG lSize);
-+    HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam);
-+    HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi);
-+    HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer);
-+    HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer);
-+    HRESULT EndRecord(void);
-+    HRESULT DeleteStream(DWORD fccType, LONG lParam);
-+};
-diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
-index 0fd74c4..9cce2d3 100644
---- a/dlls/avifil32/avifile_private.h
-+++ b/dlls/avifil32/avifile_private.h
-@@ -67,5 +67,6 @@ extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN;
- extern PAVIFILE  AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN;
- 
- extern LPCWSTR  AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN;
-+extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN;
- 
- #endif
-diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
-index c74a716..1b8988d 100644
---- a/dlls/avifil32/factory.c
-+++ b/dlls/avifil32/factory.c
-@@ -195,12 +195,18 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath)
-  */
- HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv)
- {
-+  HRESULT hr;
-+
-   TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv);
- 
-   if (pclsid == NULL || piid == NULL || ppv == NULL)
-     return E_FAIL;
- 
--  return AVIFILE_CreateClassFactory(pclsid,piid,ppv);
-+  hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv);
-+  if (SUCCEEDED(hr))
-+    return hr;
-+
-+  return avifil32_DllGetClassObject(pclsid,piid,ppv);
- }
- 
- /*****************************************************************************
--- 
-2.7.0
-

patches/avifil32-AVIFile_Proxies/definition

@@ -1 +0,0 @@
-Fixes: [38564] Add support for AVIFile interface proxies

patches/bcrypt-BCryptDeriveKeyPBKDF2/0001-bcrypt-Implement-BCryptDeriveKeyPBKDF2-and-add-test-.patch

@@ -0,0 +1,346 @@
+From d850bbb2836fa4d77c7842009901382b54f29a69 Mon Sep 17 00:00:00 2001
+From: Jack Grigg <me@jackgrigg.com>
+Date: Sat, 17 Mar 2018 21:14:05 +1100
+Subject: [PATCH] bcrypt: Implement BCryptDeriveKeyPBKDF2 and add test vectors.
+
+Fixes https://bugs.winehq.org/show_bug.cgi?id=42704
+
+Tested on Ubuntu 16.04.2 LTS.
+
+v2 - Removed C++ comment
+   - Removed all warnings.
+   - Use heap_* functions
+   - Formatting changes.
+
+Signed-off-by: Jack Grigg <me@jackgrigg.com>
+---
+ dlls/bcrypt/bcrypt.spec    |   1 +
+ dlls/bcrypt/bcrypt_main.c  | 163 +++++++++++++++++++++++++++++++++++++++++++++
+ dlls/bcrypt/tests/bcrypt.c |  85 +++++++++++++++++++++++
+ include/bcrypt.h           |   1 +
+ 4 files changed, 250 insertions(+)
+
+diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
+index 78824d73b39..f4d9a57bb08 100644
+--- a/dlls/bcrypt/bcrypt.spec
++++ b/dlls/bcrypt/bcrypt.spec
+@@ -8,6 +8,7 @@
+ @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long)
+ @ stub BCryptDeleteContext
+ @ stub BCryptDeriveKey
++@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
+ @ stdcall BCryptDestroyHash(ptr)
+ @ stdcall BCryptDestroyKey(ptr)
+ @ stub BCryptDestroySecret
+diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
+index 1490089cf72..4ffab1a9cf9 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -2282,6 +2282,169 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
+     }
+ }
+ 
++NTSTATUS PBKDF2_F( BCRYPT_ALG_HANDLE algorithm,
++                   UCHAR *password, ULONG password_length,
++                   UCHAR *salt, ULONG salt_length,
++                   ULONGLONG iterations, int i,
++                   UCHAR *res, int hash_length )
++{
++    BCRYPT_HASH_HANDLE handle;
++    NTSTATUS status = STATUS_NOT_SUPPORTED;
++    UCHAR bytes[4];
++    UCHAR *tmp;
++    int j;
++    int k;
++
++    if (!(tmp = heap_alloc( hash_length )))
++    {
++        return STATUS_NO_MEMORY;
++    }
++
++    for (j = 0; j < iterations; j++)
++    {
++        status = BCryptCreateHash( algorithm, &handle, NULL, 0,
++                                   password, password_length, 0 );
++        if (status != STATUS_SUCCESS)
++            goto done;
++
++        if (j == 0)
++        {
++            /* Use salt || INT(i) */
++            status = BCryptHashData( handle, salt, salt_length, 0 );
++            if (status != STATUS_SUCCESS)
++                goto done;
++            bytes[0] = (i >> 24) & 0xFF;
++            bytes[1] = (i >> 16) & 0xFF;
++            bytes[2] = (i >> 8) & 0xFF;
++            bytes[3] = i & 0xFF;
++            status = BCryptHashData( handle, bytes, 4, 0 );
++        }
++        else
++        {
++            /* Use U_j */
++            status = BCryptHashData( handle, tmp, hash_length, 0 );
++        }
++        if (status != STATUS_SUCCESS)
++            goto done;
++
++        status = BCryptFinishHash( handle, tmp, hash_length, 0 );
++        if (status != STATUS_SUCCESS)
++            goto done;
++
++        status = BCryptDestroyHash( handle );
++        if (status != STATUS_SUCCESS)
++            goto done;
++
++        handle = NULL;
++
++        if (j == 0)
++        {
++            /* Copy into res */
++            memcpy( res, tmp, hash_length );
++        }
++        else
++        {
++            /* XOR into res */
++            for (k = 0; k < hash_length; k++)
++                res[k] ^= tmp[k];
++        }
++    }
++
++done:
++    TRACE("<- status 0x%08x\n", status);
++    if(handle)
++        BCryptDestroyHash( handle );
++    heap_free( tmp );
++    return status;
++}
++
++/************************************************************
++ *            BCryptDeriveKeyPBKDF2   (BCRYPT.@)
++ *
++ * Derive a key from a password using the PBKDF2 function
++ * (RFC 2898).
++ *
++ * PARAMS
++ *   handle          [I] Pointer to the PRF provider
++ *   password        [I] Optional pointer to the beginning of the password
++ *   password_length [I] Length of the password
++ *   salt            [I] Optional pointer to the beginning of the salt
++ *   salt_length     [I] Length of the salt
++ *   iterations      [I] Iteration count
++ *   dk              [O] Pointer to the beginning of the buffer to store the
++ *                       derived key in, at least dklen in size
++ *   dklen           [I] Intended length of the derived key, at most
++ *                       (2^32 - 1) * (output length of PRF)
++ *   flags           [I] Reserved, must be zero
++ *
++ * RETURNS
++ *   Success: STATUS_SUCCESS.
++ *   Failure: - STATUS_INVALID_HANDLE
++ *            - STATUS_INVALID_PARAMETER
++ *            - STATUS_NO_MEMORY
++ */
++NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle,
++                                       PUCHAR password, ULONG password_length,
++                                       PUCHAR salt, ULONG salt_length,
++                                       ULONGLONG iterations,
++                                       PUCHAR dk, ULONG dklen,
++                                       ULONG flags )
++{
++    struct algorithm *alg = handle;
++    int hlen = alg_props[alg->id].hash_length;
++    UCHAR *partial;
++    NTSTATUS status;
++    int l;
++    int r;
++    int i;
++
++    TRACE( "%p, %p, %u, %p, %u, %s, %p, %u, %08x - stub\n",
++           handle, password, password_length, salt, salt_length,
++           wine_dbgstr_longlong(iterations), dk, dklen, flags );
++
++    if (dklen <= 0 || dklen > ((((ULONGLONG) 1) << 32) - 1) * hlen)
++    {
++        return STATUS_INVALID_PARAMETER;
++    }
++
++    l = 1 + ((dklen - 1) / hlen); /* ceil(dklen/hlen) */
++    r = dklen - (l - 1) * hlen;
++
++    /* Full blocks */
++    for (i = 1; i < l; i++)
++    {
++        status = PBKDF2_F( handle,
++                           password, password_length,
++                           salt, salt_length,
++                           iterations, i,
++                           dk + ((i - 1) * hlen), hlen );
++        if (status != STATUS_SUCCESS)
++        {
++            return status;
++        }
++    }
++
++    /* Final partial block */
++    if (!(partial = heap_alloc( hlen )))
++    {
++        return STATUS_NO_MEMORY;
++    }
++    status = PBKDF2_F( handle,
++                       password, password_length,
++                       salt, salt_length,
++                       iterations, l,
++                       partial, hlen );
++    if (status != STATUS_SUCCESS)
++    {
++        heap_free( partial );
++        return status;
++    }
++    memcpy( dk + ((l - 1) * hlen), partial, r );
++    heap_free( partial );
++
++    return STATUS_SUCCESS;
++}
++
+ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+ {
+     switch (reason)
+diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
+index 7d59f6d4c1d..5b1b6c7e189 100644
+--- a/dlls/bcrypt/tests/bcrypt.c
++++ b/dlls/bcrypt/tests/bcrypt.c
+@@ -26,6 +26,8 @@
+ 
+ #include "wine/test.h"
+ 
++#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
++
+ static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG);
+ static NTSTATUS (WINAPI *pBCryptCloseAlgorithmProvider)(BCRYPT_ALG_HANDLE, ULONG);
+ static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *);
+@@ -36,6 +38,8 @@ static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULO
+ 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 *pBCryptDeriveKeyPBKDF2)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG,
++                                                 ULONGLONG, PUCHAR, ULONG, ULONG);
+ static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
+ static NTSTATUS (WINAPI *pBCryptGetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG);
+ static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG);
+@@ -396,6 +400,81 @@ static void test_BcryptHash(void)
+     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
+ }
+ 
++/* Test vectors from RFC 6070 */
++static UCHAR password[] = "password";
++static UCHAR salt[] = "salt";
++static UCHAR long_password[] =
++    "passwordPASSWORDpassword";
++static UCHAR long_salt[] =
++    "saltSALTsaltSALTsaltSALTsaltSALTsalt";
++static UCHAR password_NUL[] = "pass\0word";
++static UCHAR salt_NUL[] = "sa\0lt";
++
++static UCHAR dk1[] =
++    "0c60c80f961f0e71f3a9b524af6012062fe037a6";
++static UCHAR dk2[] =
++    "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957";
++static UCHAR dk3[] =
++    "4b007901b765489abead49d926f721d065a429c1";
++static UCHAR dk4[] =
++    "eefe3d61cd4da4e4e9945b3d6ba2158c2634e984";
++static UCHAR dk5[] =
++    "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038";
++static UCHAR dk6[] =
++    "56fa6aa75548099dcc37d7f03425e0c3";
++
++static const struct {
++    ULONG password_length;
++    ULONG salt_length;
++    ULONGLONG iterations;
++    ULONG dklen;
++    UCHAR *password;
++    UCHAR *salt;
++    const UCHAR *dk;
++} rfc6070[] = {
++    {  8,  4,        1, 20, password,      salt,      dk1 },
++    {  8,  4,        2, 20, password,      salt,      dk2 },
++    {  8,  4,     4096, 20, password,      salt,      dk3 },
++    {  8,  4, 16777216, 20, password,      salt,      dk4 },
++    { 24, 36,     4096, 25, long_password, long_salt, dk5 },
++    {  9,  5,     4096, 16, password_NUL,  salt_NUL,  dk6 }
++};
++
++static void test_BcryptDeriveKeyPBKDF2(void)
++{
++    BCRYPT_ALG_HANDLE alg;
++    UCHAR dk[25];
++    char str[51];
++    NTSTATUS ret;
++    int i;
++
++    alg = NULL;
++    ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER,
++                                       BCRYPT_ALG_HANDLE_HMAC_FLAG);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++    ok(alg != NULL, "alg not set\n");
++
++    test_hash_length(alg, 20);
++    test_alg_name(alg, "SHA1");
++
++    for (i = 0; i < ARRAY_SIZE(rfc6070); i++)
++    {
++        memset(dk, 0, sizeof(dk));
++        ret = pBCryptDeriveKeyPBKDF2(alg,
++                                     rfc6070[i].password, rfc6070[i].password_length,
++                                     rfc6070[i].salt, rfc6070[i].salt_length,
++                                     rfc6070[i].iterations,
++                                     dk, rfc6070[i].dklen,
++                                     0);
++        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++        format_hash( dk, rfc6070[i].dklen, str );
++        ok(!memcmp(str, rfc6070[i].dk, rfc6070[i].dklen), "got %s\n", str);
++    }
++
++    ret = pBCryptCloseAlgorithmProvider(alg, 0);
++    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
++}
++
+ static void test_rng(void)
+ {
+     BCRYPT_ALG_HANDLE alg;
+@@ -1609,6 +1688,7 @@ START_TEST(bcrypt)
+     pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash");
+     pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash");
+     pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash");
++    pBCryptDeriveKeyPBKDF2 = (void *)GetProcAddress(module, "BCryptDeriveKeyPBKDF2");
+     pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom");
+     pBCryptGetProperty = (void *)GetProcAddress(module, "BCryptGetProperty");
+     pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty");
+@@ -1639,5 +1719,10 @@ START_TEST(bcrypt)
+     else
+         win_skip("BCryptHash is not available\n");
+ 
++    if (pBCryptDeriveKeyPBKDF2) /* >= Win 7 */
++        test_BcryptDeriveKeyPBKDF2();
++    else
++        win_skip("BCryptDeriveKeyPBKDF2 is not available\n");
++
+     FreeLibrary(module);
+ }
+diff --git a/include/bcrypt.h b/include/bcrypt.h
+index df54f621fa7..d3e4b9959dc 100644
+--- a/include/bcrypt.h
++++ b/include/bcrypt.h
+@@ -217,6 +217,7 @@ typedef PVOID BCRYPT_HASH_HANDLE;
+ NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG);
+ NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
+ NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
++NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
+ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
+ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
+ NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
+-- 
+2.16.2
+

patches/bcrypt-BCryptDeriveKeyPBKDF2/definition

@@ -0,0 +1,2 @@
+Fixes: [42704] Implement BCryptDeriveKeyPBKDF2
+Depends: crypt32-ECDSA_Cert_Chains

patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch

@@ -1,263 +0,0 @@
-From 82785fee09e7d5cfce76ca4cc08291ecba19d393 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 26 Dec 2016 05:37:02 +0100
-Subject: [PATCH] bcrypt/tests: Add tests for AES GCM mode.
-
----
- dlls/bcrypt/tests/bcrypt.c | 155 ++++++++++++++++++++++++++++++++++++++++++++-
- include/bcrypt.h           |  24 ++++++-
- 2 files changed, 177 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 6e28348..6cefe13 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -564,6 +564,8 @@ static void test_BCryptGenerateSymmetricKey(void)
- 
- static void test_BCryptEncrypt(void)
- {
-+    static UCHAR nonce[] =
-+        {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60};
-     static UCHAR secret[] =
-         {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
-     static UCHAR iv[] =
-@@ -582,15 +584,28 @@ static void test_BCryptEncrypt(void)
-         {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79,
-          0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb,
-          0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4};
-+    static UCHAR expected4[] =
-+        {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67,
-+         0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
-+    static UCHAR expected_tag[] =
-+        {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
-+    static UCHAR expected_tag2[] =
-+        {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd};
-+    BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
-+    UCHAR *buf, ciphertext[48], ivbuf[16], tag[16];
-+    BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length;
-     BCRYPT_ALG_HANDLE aes;
-     BCRYPT_KEY_HANDLE key;
--    UCHAR *buf, ciphertext[48], ivbuf[16];
-     ULONG size, len, i;
-     NTSTATUS ret;
- 
-     ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-+    /******************
-+     * AES - CBC mode *
-+     ******************/
-+
-     len = 0xdeadbeef;
-     size = sizeof(len);
-     ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
-@@ -677,12 +692,101 @@ static void test_BCryptEncrypt(void)
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-     HeapFree(GetProcessHeap(), 0, buf);
- 
-+    /******************
-+     * AES - GCM mode *
-+     ******************/
-+
-+    size = 0;
-+    ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
-+    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);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    size = 0;
-+    ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    todo_wine ok(size == sizeof(tag_length), "got %u\n", size);
-+
-+    size = 0;
-+    memset(&tag_length, 0, sizeof(tag_length));
-+    ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    todo_wine ok(size == sizeof(tag_length), "got %u\n", size);
-+    todo_wine ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength);
-+    todo_wine ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength);
-+    todo_wine ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement);
-+
-+    len = 0xdeadbeef;
-+    size = sizeof(len);
-+    ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-+    ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    memset(&auth_info, 0, sizeof(auth_info));
-+    auth_info.cbSize = sizeof(auth_info);
-+    auth_info.dwInfoVersion = 1;
-+    auth_info.pbNonce = nonce;
-+    auth_info.cbNonce = sizeof(nonce);
-+    auth_info.pbTag = tag;
-+    auth_info.cbTag = sizeof(tag);
-+
-+    /* input size is a multiple of block size */
-+    size = 0;
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(ciphertext, 0xff, sizeof(ciphertext));
-+    memset(tag, 0xff, sizeof(tag));
-+    ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    todo_wine ok(size == 32, "got %u\n", size);
-+    todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n");
-+    todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n");
-+    for (i = 0; i < 32; i++)
-+        todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-+    for (i = 0; i < 16; i++)
-+        todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]);
-+
-+    /* input size is not multiple of block size */
-+    size = 0;
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(ciphertext, 0xff, sizeof(ciphertext));
-+    memset(tag, 0xff, sizeof(tag));
-+    ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    todo_wine ok(size == 24, "got %u\n", size);
-+    todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n");
-+    todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n");
-+    for (i = 0; i < 24; i++)
-+        todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-+    for (i = 0; i < 16; i++)
-+        todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
-+
-+    /* test with padding */
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(ciphertext, 0, sizeof(ciphertext));
-+    ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING);
-+    todo_wine ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret);
-+
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(ciphertext, 0, sizeof(ciphertext));
-+    ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING);
-+    todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
-+
-+    ret = pBCryptDestroyKey(key);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    HeapFree(GetProcessHeap(), 0, buf);
-+
-     ret = pBCryptCloseAlgorithmProvider(aes, 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- }
- 
- static void test_BCryptDecrypt(void)
- {
-+    static UCHAR nonce[] =
-+        {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60};
-     static UCHAR secret[] =
-         {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
-     static UCHAR iv[] =
-@@ -704,6 +808,12 @@ static void test_BCryptDecrypt(void)
-         {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79,
-          0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb,
-          0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4};
-+    static UCHAR ciphertext4[] =
-+        {0xe1,0x82,0xc3,0xc0,0x24,0xfb,0x86,0x85,0xf3,0xf1,0x2b,0x7d,0x09,0xb4,0x73,0x67,
-+         0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
-+    static UCHAR tag[] =
-+        {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
-+    BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
-     BCRYPT_KEY_LENGTHS_STRUCT key_lengths;
-     BCRYPT_ALG_HANDLE aes;
-     BCRYPT_KEY_HANDLE key;
-@@ -723,6 +833,10 @@ static void test_BCryptDecrypt(void)
-     ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength);
-     ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement);
- 
-+    /******************
-+     * AES - CBC mode *
-+     ******************/
-+
-     len = 0xdeadbeef;
-     size = sizeof(len);
-     ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
-@@ -820,6 +934,45 @@ static void test_BCryptDecrypt(void)
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-     HeapFree(GetProcessHeap(), 0, buf);
- 
-+    /******************
-+     * AES - GCM mode *
-+     ******************/
-+
-+    ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-+    ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    memset(&auth_info, 0, sizeof(auth_info));
-+    auth_info.cbSize = sizeof(auth_info);
-+    auth_info.dwInfoVersion = 1;
-+    auth_info.pbNonce = nonce;
-+    auth_info.cbNonce = sizeof(nonce);
-+    auth_info.pbTag = tag;
-+    auth_info.cbTag = sizeof(tag);
-+
-+    /* input size is a multiple of block size */
-+    size = 0;
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(plaintext, 0, sizeof(plaintext));
-+    ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
-+    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    todo_wine ok(size == 32, "got %u\n", size);
-+    todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
-+
-+    /* test with wrong tag */
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    auth_info.pbTag = iv; /* wrong tag */
-+    ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
-+    todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret);
-+    todo_wine ok(size == 32, "got %u\n", size);
-+
-+    ret = pBCryptDestroyKey(key);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    HeapFree(GetProcessHeap(), 0, buf);
-+
-     ret = pBCryptCloseAlgorithmProvider(aes, 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- }
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 1be9b85..d0b29c7 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -96,7 +96,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT
-     ULONG dwMinLength;
-     ULONG dwMaxLength;
-     ULONG dwIncrement;
--} BCRYPT_KEY_LENGTHS_STRUCT;
-+} BCRYPT_KEY_LENGTHS_STRUCT, BCRYPT_AUTH_TAG_LENGTHS_STRUCT;
-+
-+typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO
-+{
-+    ULONG cbSize;
-+    ULONG dwInfoVersion;
-+    UCHAR *pbNonce;
-+    ULONG cbNonce;
-+    UCHAR *pbAuthData;
-+    ULONG cbAuthData;
-+    UCHAR *pbTag;
-+    ULONG cbTag;
-+    UCHAR *pbMacContext;
-+    ULONG cbMacContext;
-+    ULONG cbAAD;
-+    ULONGLONG cbData;
-+    ULONG dwFlags;
-+} BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO;
-+
-+#define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1
-+
-+#define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001
-+#define BCRYPT_AUTH_MODE_IN_PROGRESS_FLAG 0x00000002
- 
- typedef struct _CRYPT_INTERFACE_REG
- {
--- 
-1.9.1
-

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

@@ -1,156 +0,0 @@
-From 2d4fc0dc7d0c64fb45683af54d659832493e2a7e Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 26 Dec 2016 06:18:01 +0100
-Subject: [PATCH 12/36] bcrypt: Pass object to get_{alg,hash}_property instead
- of alg_id.
-
----
- dlls/bcrypt/bcrypt_main.c | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 6e47349..8af43c8 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -510,15 +510,15 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
--static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
-+static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
- {
-     NTSTATUS status;
- 
--    status = generic_alg_property( id, prop, buf, size, ret_size );
-+    status = generic_alg_property( alg->id, prop, buf, size, ret_size );
-     if (status != STATUS_NOT_IMPLEMENTED)
-         return status;
- 
--    switch (id)
-+    switch (alg->id)
-     {
-     case ALG_ID_AES:
-         if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH ))
-@@ -567,11 +567,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 )
-+static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
- {
-     NTSTATUS status;
- 
--    status = generic_alg_property( id, prop, buf, size, ret_size );
-+    status = generic_alg_property( hash->alg_id, prop, buf, size, ret_size );
-     if (status == STATUS_NOT_IMPLEMENTED)
-         FIXME( "unsupported property %s\n", debugstr_w(prop) );
-     return status;
-@@ -591,12 +591,12 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu
-     case MAGIC_ALG:
-     {
-         const struct algorithm *alg = (const struct algorithm *)object;
--        return get_alg_property( alg->id, prop, buffer, count, res );
-+        return get_alg_property( alg, prop, buffer, count, res );
-     }
-     case MAGIC_HASH:
-     {
-         const struct hash *hash = (const struct hash *)object;
--        return get_hash_property( hash->alg_id, prop, buffer, count, res );
-+        return get_hash_property( hash, prop, buffer, count, res );
-     }
-     default:
-         WARN( "unknown magic %08x\n", object->magic );
-@@ -798,7 +798,7 @@ struct key
- #endif
- 
- #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
--static ULONG get_block_size( enum alg_id alg )
-+static ULONG get_block_size( struct algorithm *alg )
- {
-     ULONG ret = 0, size = sizeof(ret);
-     get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size );
-@@ -827,27 +827,27 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U
- #endif
- 
- #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
--static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len )
-+static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len )
- {
-     UCHAR *buffer;
- 
-     if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
- 
--    switch (id)
-+    switch (alg->id)
-     {
-     case ALG_ID_AES:
-         break;
- 
-     default:
--        FIXME( "algorithm %u not supported\n", id );
-+        FIXME( "algorithm %u not supported\n", alg->id );
-         return STATUS_NOT_SUPPORTED;
-     }
- 
--    if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER;
-+    if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER;
-     if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY;
-     memcpy( buffer, secret, secret_len );
- 
--    key->alg_id     = id;
-+    key->alg_id     = alg->id;
-     key->handle     = 0;        /* initialized on first use */
-     key->secret     = buffer;
-     key->secret_len = secret_len;
-@@ -937,25 +937,25 @@ static NTSTATUS key_destroy( struct key *key )
-     return STATUS_SUCCESS;
- }
- #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
--static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len )
-+static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len )
- {
-     UCHAR *buffer;
- 
--    switch (id)
-+    switch (alg->id)
-     {
-     case ALG_ID_AES:
-         break;
- 
-     default:
--        FIXME( "algorithm %u not supported\n", id );
-+        FIXME( "algorithm %u not supported\n", alg->id );
-         return STATUS_NOT_SUPPORTED;
-     }
- 
--    if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER;
-+    if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER;
-     if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY;
-     memcpy( buffer, secret, secret_len );
- 
--    key->alg_id      = id;
-+    key->alg_id      = alg->id;
-     key->ref_encrypt = NULL;        /* initialized on first use */
-     key->ref_decrypt = NULL;
-     key->secret      = buffer;
-@@ -1034,7 +1034,7 @@ static NTSTATUS key_destroy( struct key *key )
-     return STATUS_SUCCESS;
- }
- #else
--static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len )
-+static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len )
- {
-     ERR( "support for keys not available at build time\n" );
-     return STATUS_NOT_IMPLEMENTED;
-@@ -1089,7 +1089,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_
-     if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY;
-     key->hdr.magic = MAGIC_KEY;
- 
--    if ((status = key_init( key, alg->id, secret, secret_len )))
-+    if ((status = key_init( key, alg, secret, secret_len )))
-     {
-         heap_free( key );
-         return status;
--- 
-2.7.4
-

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

@@ -1,149 +0,0 @@
-From d0252a03c82c8b3c3e6bb8bed0007e844b10301c 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: [PATCH 13/36] bcrypt: Implement BCryptSetProperty for algorithms.
-
----
- dlls/bcrypt/bcrypt_main.c  | 66 ++++++++++++++++++++++++++++++++++++++++++++--
- dlls/bcrypt/tests/bcrypt.c |  6 ++---
- 2 files changed, 67 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 73a5c36fed..cbf7576860 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -192,6 +192,12 @@ enum alg_id
-     ALG_ID_SHA512
- };
- 
-+enum mode_id
-+{
-+    MODE_ID_CBC,
-+    MODE_ID_GCM
-+};
-+
- #define MAX_HASH_OUTPUT_BYTES 64
- #define MAX_HASH_BLOCK_BITS 1024
- 
-@@ -216,6 +222,7 @@ struct algorithm
- {
-     struct object hdr;
-     enum alg_id   id;
-+    enum mode_id  mode;
-     BOOL hmac;
- };
- 
-@@ -298,6 +305,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
-     if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY;
-     alg->hdr.magic = MAGIC_ALG;
-     alg->id        = alg_id;
-+    alg->mode      = MODE_ID_CBC;
-     alg->hmac      = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG;
- 
-     *handle = alg;
-@@ -567,6 +575,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 )
-+{
-+    switch (alg->id)
-+    {
-+    case ALG_ID_AES:
-+        if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
-+        {
-+            if (size == sizeof(BCRYPT_CHAIN_MODE_CBC) &&
-+                !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
-+            {
-+                alg->mode = MODE_ID_CBC;
-+                return STATUS_SUCCESS;
-+            }
-+            else if (size == sizeof(BCRYPT_CHAIN_MODE_GCM) &&
-+                     !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size ))
-+            {
-+                alg->mode = MODE_ID_GCM;
-+                return STATUS_SUCCESS;
-+            }
-+            else
-+            {
-+                FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) );
-+                return STATUS_NOT_IMPLEMENTED;
-+            }
-+        }
-+        FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) );
-+        return STATUS_NOT_IMPLEMENTED;
-+
-+    default:
-+        FIXME( "unsupported algorithm %u\n", alg->id );
-+        return STATUS_NOT_IMPLEMENTED;
-+    }
-+}
-+
- static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )
- {
-     NTSTATUS status;
-@@ -606,8 +648,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 )
- {
--    FIXME( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags );
--    return STATUS_NOT_IMPLEMENTED;
-+    struct object *object = handle;
-+
-+    TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags );
-+
-+    if (!object) return STATUS_INVALID_HANDLE;
-+
-+    switch (object->magic)
-+    {
-+    case MAGIC_ALG:
-+    {
-+        struct algorithm *alg = (struct algorithm *)object;
-+        return set_alg_property( alg, prop, value, size, flags );
-+    }
-+    case MAGIC_KEY:
-+    {
-+        FIXME( "keys not implemented yet\n" );
-+        return STATUS_NOT_IMPLEMENTED;
-+    }
-+    default:
-+        WARN( "unknown magic %08x\n", object->magic );
-+        return STATUS_INVALID_HANDLE;
-+    }
- }
- 
- 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 6cefe13226..75c25d0929 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -512,7 +512,7 @@ static void test_BCryptGenerateSymmetricKey(void)
- 
-     ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC,
-                             sizeof(BCRYPT_CHAIN_MODE_CBC), 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-     size = 0xdeadbeef;
-     ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0);
-@@ -701,7 +701,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);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-     size = 0;
-     ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
-@@ -939,7 +939,7 @@ static void test_BCryptDecrypt(void)
-      ******************/
- 
-     ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-     buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-     ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);
--- 
-2.16.1
-

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

@@ -1,45 +0,0 @@
-From 6aa0794091b1ea7ef5f4bf686d4b7fbcab12d213 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: [PATCH 14/36] bcrypt: Implement BCryptGetProperty for
- BCRYPT_CHAINING_MODE.
-
----
- dlls/bcrypt/bcrypt_main.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index cbf7576860..186e619d5f 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -540,17 +540,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
-         }
-         if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
-         {
--            if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR))
-+            const WCHAR *mode;
-+            switch (alg->mode)
-             {
--                memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC));
--                *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR);
--                return STATUS_SUCCESS;
--            }
--            else
--            {
--                *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR);
--                return STATUS_BUFFER_TOO_SMALL;
-+                case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break;
-+                case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break;
-+                default: return STATUS_NOT_IMPLEMENTED;
-             }
-+
-+            *ret_size = 64;
-+            if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL;
-+            memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) );
-+            return STATUS_SUCCESS;
-         }
-         if (!strcmpW( prop, BCRYPT_KEY_LENGTHS ))
-         {
--- 
-2.16.1
-

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

@@ -1,76 +0,0 @@
-From 35d3ff46ea1c10f5c3d78ff4ea3abd91a6778bf0 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: [PATCH 15/36] bcrypt: Implement BCryptGetProperty for
- BCRYPT_AUTH_TAG_LENGTH.
-
----
- dlls/bcrypt/bcrypt_main.c  | 14 ++++++++++++++
- dlls/bcrypt/tests/bcrypt.c | 16 ++++++++--------
- 2 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 186e619d5f..47ed8e0533 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -566,6 +566,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
-             }
-             return STATUS_SUCCESS;
-         }
-+        if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH ))
-+        {
-+            BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf;
-+            if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED;
-+            *ret_size = sizeof(*tag_length);
-+            if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL;
-+            if (tag_length)
-+            {
-+                tag_length->dwMinLength = 12;
-+                tag_length->dwMaxLength = 16;
-+                tag_length->dwIncrement =  1;
-+            }
-+            return STATUS_SUCCESS;
-+        }
-         break;
- 
-     default:
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 75c25d0929..27feabb5f4 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -698,24 +698,24 @@ static void test_BCryptEncrypt(void)
- 
-     size = 0;
-     ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
--    todo_wine ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret);
-+    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);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-     size = 0;
-     ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--    todo_wine ok(size == sizeof(tag_length), "got %u\n", size);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == sizeof(tag_length), "got %u\n", size);
- 
-     size = 0;
-     memset(&tag_length, 0, sizeof(tag_length));
-     ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--    todo_wine ok(size == sizeof(tag_length), "got %u\n", size);
--    todo_wine ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength);
--    todo_wine ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength);
--    todo_wine ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == sizeof(tag_length), "got %u\n", size);
-+    ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength);
-+    ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength);
-+    ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement);
- 
-     len = 0xdeadbeef;
-     size = sizeof(len);
--- 
-2.16.1
-

patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch

@@ -1,56 +0,0 @@
-From 8959d51b23f1f001670662ea19bd5b65ed477719 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 26 Dec 2016 07:21:27 +0100
-Subject: [PATCH 16/36] bcrypt: Fix string comparison in set_alg_property.
-
----
- dlls/bcrypt/bcrypt_main.c  |  6 ++----
- dlls/bcrypt/tests/bcrypt.c | 11 +++++++++++
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 47ed8e0533..9e9e357634 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -597,14 +597,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA
-     case ALG_ID_AES:
-         if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
-         {
--            if (size == sizeof(BCRYPT_CHAIN_MODE_CBC) &&
--                !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
-+            if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
-             {
-                 alg->mode = MODE_ID_CBC;
-                 return STATUS_SUCCESS;
-             }
--            else if (size == sizeof(BCRYPT_CHAIN_MODE_GCM) &&
--                     !strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size ))
-+            else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size ))
-             {
-                 alg->mode = MODE_ID_GCM;
-                 return STATUS_SUCCESS;
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 27feabb5f4..70d9e0c246 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -475,6 +475,17 @@ static void test_aes(void)
-     ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength);
-     ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement);
- 
-+    memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM));
-+    ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+
-+    size = 0;
-+    memset(mode, 0, sizeof(mode));
-+    ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", mode);
-+    ok(size == 64, "got %u\n", size);
-+
-     test_alg_name(alg, "AES");
- 
-     ret = pBCryptCloseAlgorithmProvider(alg, 0);
--- 
-2.16.1
-

patches/bcrypt-Improvements/0017-bcrypt-Implement-BCryptEncrypt-for-AES-GCM-mode.patch

@@ -1,200 +0,0 @@
-From d056be40dd9cd96ec2ef6efa85fe9a630948a305 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 26 Dec 2016 07:46:57 +0100
-Subject: [PATCH 17/36] bcrypt: Implement BCryptEncrypt for AES GCM mode.
-
----
- dlls/bcrypt/bcrypt_main.c  | 60 +++++++++++++++++++++++++++++++++++++++-------
- dlls/bcrypt/tests/bcrypt.c | 18 +++++++-------
- 2 files changed, 61 insertions(+), 17 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index fa80318..dfdb7b2 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level);
- MAKE_FUNCPTR(gnutls_perror);
- #undef MAKE_FUNCPTR
- 
-+#if GNUTLS_VERSION_MAJOR < 3
-+#define GNUTLS_CIPHER_AES_192_CBC 92
-+#define GNUTLS_CIPHER_AES_128_GCM 93
-+#define GNUTLS_CIPHER_AES_256_GCM 94
-+#endif
-+
- static void gnutls_log( int level, const char *msg )
- {
-     TRACE( "<%d> %s", level, msg );
-@@ -848,6 +854,7 @@ struct key
- {
-     struct object      hdr;
-     enum alg_id        alg_id;
-+    enum mode_id       mode;
-     ULONG              block_size;
-     gnutls_cipher_hd_t handle;
-     UCHAR             *secret;
-@@ -858,6 +865,7 @@ struct key
- {
-     struct object  hdr;
-     enum alg_id    alg_id;
-+    enum mode_id   mode;
-     ULONG          block_size;
-     CCCryptorRef   ref_encrypt;
-     CCCryptorRef   ref_decrypt;
-@@ -868,6 +876,7 @@ struct key
- struct key
- {
-     struct object hdr;
-+    enum mode_id  mode;
-     ULONG         block_size;
- };
- #endif
-@@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     memcpy( buffer, secret, secret_len );
- 
-     key->alg_id     = alg->id;
-+    key->mode       = alg->mode;
-     key->handle     = 0;        /* initialized on first use */
-     key->secret     = buffer;
-     key->secret_len = secret_len;
-@@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
-     switch (key->alg_id)
-     {
-     case ALG_ID_AES:
--        FIXME( "handle block size and chaining mode\n" );
--        return GNUTLS_CIPHER_AES_128_CBC;
--
-+        WARN( "handle block size\n" );
-+        switch (key->mode)
-+        {
-+            case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM;
-+            case MODE_ID_CBC:
-+            default:          return GNUTLS_CIPHER_AES_128_CBC;
-+        }
-     default:
-         FIXME( "algorithm %u not supported\n", key->alg_id );
-         return GNUTLS_CIPHER_UNKNOWN;
-@@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     switch (alg->id)
-     {
-     case ALG_ID_AES:
-+        switch (alg->mode)
-+        {
-+            case MODE_ID_CBC:
-+                break;
-+            default:
-+                FIXME( "mode %u not supported\n", alg->mode );
-+                return STATUS_NOT_SUPPORTED;
-+        }
-         break;
- 
-     default:
-@@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     memcpy( buffer, secret, secret_len );
- 
-     key->alg_id      = alg->id;
-+    key->mode        = alg->mode;
-     key->ref_encrypt = NULL;        /* initialized on first use */
-     key->ref_decrypt = NULL;
-     key->secret      = buffer;
-@@ -1112,6 +1135,7 @@ static NTSTATUS key_destroy( struct key *key )
- static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len )
- {
-     ERR( "support for keys not available at build time\n" );
-+    key->mode = MODE_ID_CBC;
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-@@ -1260,17 +1284,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-            padding, iv, iv_len, output, output_len, ret_len, flags );
- 
-     if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
--    if (padding)
--    {
--        FIXME( "padding info not implemented\n" );
--        return STATUS_NOT_IMPLEMENTED;
--    }
-     if (flags & ~BCRYPT_BLOCK_PADDING)
-     {
-         FIXME( "flags %08x not implemented\n", flags );
-         return STATUS_NOT_IMPLEMENTED;
-     }
- 
-+    if (key->mode == MODE_ID_GCM)
-+    {
-+        BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding;
-+
-+        if (!auth_info) return STATUS_INVALID_PARAMETER;
-+        if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER;
-+        if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER;
-+        if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER;
-+        if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG)
-+            FIXME( "call chaining not implemented\n" );
-+
-+        if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce )))
-+            return status;
-+
-+        *ret_len = input_len;
-+        if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER;
-+        if (!output) return STATUS_SUCCESS;
-+        if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL;
-+
-+        if ((status = key_encrypt( key, input, input_len, output, output_len )))
-+            return status;
-+
-+        return STATUS_SUCCESS;
-+    }
-+
-     if ((status = key_set_params( key, iv, iv_len ))) return status;
- 
-     *ret_len = input_len;
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 70d9e0c..355a414 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void)
-     memset(ciphertext, 0xff, sizeof(ciphertext));
-     memset(tag, 0xff, sizeof(tag));
-     ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--    todo_wine ok(size == 32, "got %u\n", size);
--    todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n");
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == 32, "got %u\n", size);
-+    ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n");
-     todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n");
-     for (i = 0; i < 32; i++)
--        todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-+        ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-     for (i = 0; i < 16; i++)
-         todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]);
- 
-@@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void)
-     memset(ciphertext, 0xff, sizeof(ciphertext));
-     memset(tag, 0xff, sizeof(tag));
-     ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--    todo_wine ok(size == 24, "got %u\n", size);
--    todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n");
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == 24, "got %u\n", size);
-+    ok(!memcmp(ciphertext, expected4, 24), "wrong data\n");
-     todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n");
-     for (i = 0; i < 24; i++)
--        todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-+        ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-     for (i = 0; i < 16; i++)
-         todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
- 
-@@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void)
-     memcpy(ivbuf, iv, sizeof(iv));
-     memset(ciphertext, 0, sizeof(ciphertext));
-     ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING);
--    todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
-+    ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
- 
-     ret = pBCryptDestroyKey(key);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--- 
-2.7.4
-

patches/bcrypt-Improvements/0018-bcrypt-Implement-BCryptDecrypt-for-AES-GCM-mode.patch

@@ -1,83 +0,0 @@
-From 4ec53bd02df73020b29b0a9fed5b0915d95a66e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 26 Dec 2016 07:53:10 +0100
-Subject: [PATCH 18/36] bcrypt: Implement BCryptDecrypt for AES GCM mode.
-
----
- dlls/bcrypt/bcrypt_main.c  | 28 +++++++++++++++++++++++-----
- dlls/bcrypt/tests/bcrypt.c |  8 ++++----
- 2 files changed, 27 insertions(+), 9 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 387f448516..17cc92dded 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1352,17 +1352,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-            padding, iv, iv_len, output, output_len, ret_len, flags );
- 
-     if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
--    if (padding)
--    {
--        FIXME( "padding info not implemented\n" );
--        return STATUS_NOT_IMPLEMENTED;
--    }
-     if (flags & ~BCRYPT_BLOCK_PADDING)
-     {
-         FIXME( "flags %08x not supported\n", flags );
-         return STATUS_NOT_IMPLEMENTED;
-     }
- 
-+    if (key->mode == MODE_ID_GCM)
-+    {
-+        BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding;
-+
-+        if (!auth_info) return STATUS_INVALID_PARAMETER;
-+        if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER;
-+        if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER;
-+        if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER;
-+
-+        if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce )))
-+            return status;
-+
-+        *ret_len = input_len;
-+        if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER;
-+        if (!output) return STATUS_SUCCESS;
-+        if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL;
-+
-+        if ((status = key_decrypt( key, input, input_len, output, output_len )))
-+            return status;
-+
-+        return STATUS_SUCCESS;
-+    }
-+
-     if ((status = key_set_params( key, iv, iv_len ))) return status;
- 
-     *ret_len = input_len;
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 355a414bca..89a3c40850 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void)
-     memcpy(ivbuf, iv, sizeof(iv));
-     memset(plaintext, 0, sizeof(plaintext));
-     ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
--    todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--    todo_wine ok(size == 32, "got %u\n", size);
--    todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == 32, "got %u\n", size);
-+    ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
- 
-     /* test with wrong tag */
-     memcpy(ivbuf, iv, sizeof(iv));
-     auth_info.pbTag = iv; /* wrong tag */
-     ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
-     todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret);
--    todo_wine ok(size == 32, "got %u\n", size);
-+    ok(size == 32, "got %u\n", size);
- 
-     ret = pBCryptDestroyKey(key);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--- 
-2.16.1
-

patches/bcrypt-Improvements/0019-bcrypt-Add-support-for-computing-comparing-cipher-ta.patch

@@ -1,168 +0,0 @@
-From a511e42c71c2c04ee257f78cece073d08a51d32d 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:02:36 +0100
-Subject: [PATCH 19/36] bcrypt: Add support for computing/comparing cipher tag.
-
----
- dlls/bcrypt/bcrypt_main.c  | 47 +++++++++++++++++++++++++++++++++++++++++++++-
- dlls/bcrypt/tests/bcrypt.c | 10 +++++-----
- 2 files changed, 51 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 02a0106..5daddff 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -50,6 +50,9 @@ static HINSTANCE instance;
- #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
- WINE_DECLARE_DEBUG_CHANNEL(winediag);
- 
-+/* Not present in gnutls version < 3.0 */
-+static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size);
-+
- static void *libgnutls_handle;
- #define MAKE_FUNCPTR(f) static typeof(f) * p##f
- MAKE_FUNCPTR(gnutls_cipher_decrypt2);
-@@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror);
- #define GNUTLS_CIPHER_AES_256_GCM 94
- #endif
- 
-+static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size)
-+{
-+    return GNUTLS_E_UNKNOWN_CIPHER_TYPE;
-+}
-+
- static void gnutls_log( int level, const char *msg )
- {
-     TRACE( "<%d> %s", level, msg );
-@@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void)
-     LOAD_FUNCPTR(gnutls_perror)
- #undef LOAD_FUNCPTR
- 
-+    if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 )))
-+    {
-+        WARN("gnutls_cipher_tag not found\n");
-+        pgnutls_cipher_tag = compat_gnutls_cipher_tag;
-+    }
-+
-     if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS)
-     {
-         pgnutls_perror( ret );
-@@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len )
-+{
-+    int ret;
-+
-+    if ((ret = pgnutls_cipher_tag( key->handle, tag, len )))
-+    {
-+        pgnutls_perror( ret );
-+        return STATUS_INTERNAL_ERROR;
-+    }
-+
-+    return STATUS_SUCCESS;
-+}
-+
- static NTSTATUS key_destroy( struct key *key )
- {
-     if (key->handle) pgnutls_cipher_deinit( key->handle );
-@@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len )
-+{
-+    FIXME( "not implemented on Mac\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_destroy( struct key *key )
- {
-     if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt );
-@@ -1159,6 +1192,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len )
-+{
-+    ERR( "support for keys not available at build time\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_destroy( struct key *key )
- {
-     ERR( "support for keys not available at build time\n" );
-@@ -1312,7 +1351,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-         if ((status = key_encrypt( key, input, input_len, output, output_len )))
-             return status;
- 
--        return STATUS_SUCCESS;
-+        return key_get_tag( key, auth_info->pbTag, auth_info->cbTag );
-     }
- 
-     if ((status = key_set_params( key, iv, iv_len ))) return status;
-@@ -1371,6 +1410,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-     if (key->mode == MODE_ID_GCM)
-     {
-         BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding;
-+        UCHAR tag[16];
- 
-         if (!auth_info) return STATUS_INVALID_PARAMETER;
-         if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER;
-@@ -1388,6 +1428,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-         if ((status = key_decrypt( key, input, input_len, output, output_len )))
-             return status;
- 
-+        if ((status = key_get_tag( key, tag, sizeof(tag) )))
-+            return status;
-+        if (memcmp( tag, auth_info->pbTag, auth_info->cbTag ))
-+            return STATUS_AUTH_TAG_MISMATCH;
-+
-         return STATUS_SUCCESS;
-     }
- 
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 89a3c40..18cd2a2 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void)
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-     ok(size == 32, "got %u\n", size);
-     ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n");
--    todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n");
-+    ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n");
-     for (i = 0; i < 32; i++)
-         ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-     for (i = 0; i < 16; i++)
--        todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]);
-+        ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]);
- 
-     /* input size is not multiple of block size */
-     size = 0;
-@@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void)
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-     ok(size == 24, "got %u\n", size);
-     ok(!memcmp(ciphertext, expected4, 24), "wrong data\n");
--    todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n");
-+    ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n");
-     for (i = 0; i < 24; i++)
-         ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-     for (i = 0; i < 16; i++)
--        todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
-+        ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
- 
-     /* test with padding */
-     memcpy(ivbuf, iv, sizeof(iv));
-@@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void)
-     memcpy(ivbuf, iv, sizeof(iv));
-     auth_info.pbTag = iv; /* wrong tag */
-     ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
--    todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret);
-+    ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret);
-     ok(size == 32, "got %u\n", size);
- 
-     ret = pBCryptDestroyKey(key);
--- 
-2.7.4
-

patches/bcrypt-Improvements/0020-bcrypt-Implement-BCryptDuplicateKey.patch

@@ -1,140 +0,0 @@
-From 622e4b47bdabcdae3deab7347a73d0b3ea804fca 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:28:24 +0100
-Subject: [PATCH 20/36] bcrypt: Implement BCryptDuplicateKey.
-
----
- dlls/bcrypt/bcrypt.spec   |  2 +-
- dlls/bcrypt/bcrypt_main.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++
- dlls/ncrypt/ncrypt.spec   |  2 +-
- 3 files changed, 70 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 21b54b4..28c2394 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -12,7 +12,7 @@
- @ stdcall BCryptDestroyKey(ptr)
- @ stub BCryptDestroySecret
- @ stdcall BCryptDuplicateHash(ptr ptr ptr long long)
--@ stub BCryptDuplicateKey
-+@ stdcall BCryptDuplicateKey(ptr ptr ptr long long)
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long)
- @ stdcall BCryptEnumAlgorithms(long ptr ptr long)
- @ stub BCryptEnumContextFunctionProviders
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 5daddff..e72a8fd 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -954,6 +954,24 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-+{
-+    UCHAR *buffer;
-+
-+    if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY;
-+    memcpy( buffer, key_orig->secret, key_orig->secret_len );
-+
-+    key_copy->hdr           = key_orig->hdr;
-+    key_copy->alg_id        = key_orig->alg_id;
-+    key_copy->mode          = key_orig->mode;
-+    key_copy->block_size    = key_orig->block_size;
-+    key_copy->handle        = NULL;
-+    key_copy->secret        = buffer;
-+    key_copy->secret_len    = key_orig->secret_len;
-+
-+    return STATUS_SUCCESS;
-+}
-+
- static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
- {
-     switch (key->alg_id)
-@@ -1089,6 +1107,25 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-+{
-+    UCHAR *buffer;
-+
-+    if (!(buffer = HeapAlloc( GetProcessHeap(), 0, key_orig->secret_len ))) return STATUS_NO_MEMORY;
-+    memcpy( buffer, key_orig->secret, key_orig->secret_len );
-+
-+    key_copy->hdr           = key_orig->hdr;
-+    key_copy->alg_id        = key_orig->alg_id;
-+    key_copy->mode          = key_orig->mode;
-+    key_copy->block_size    = key_orig->block_size;
-+    key_copy->ref_encrypt   = NULL;
-+    key_copy->ref_decrypt   = NULL;
-+    key_copy->secret        = buffer;
-+    key_copy->secret_len    = key_orig->secret_len;
-+
-+    return STATUS_SUCCESS;
-+}
-+
- static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
- {
-     CCCryptorStatus status;
-@@ -1172,6 +1209,13 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-+{
-+    ERR( "support for keys not available at build time\n" );
-+    key_copy->mode = MODE_ID_CBC;
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
- {
-     ERR( "support for keys not available at build time\n" );
-@@ -1300,6 +1344,30 @@ NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE
-     return key_export( key, type, output, output_len, size );
- }
- 
-+NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy,
-+                                    UCHAR *object, ULONG object_len, ULONG flags )
-+{
-+    struct key *key_orig = handle;
-+    struct key *key_copy;
-+    NTSTATUS status;
-+
-+    TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags );
-+
-+    if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
-+    if (!handle_copy) return STATUS_INVALID_PARAMETER;
-+    if (!(key_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*key_copy) )))
-+        return STATUS_NO_MEMORY;
-+
-+    if ((status = key_duplicate( key_orig, key_copy )))
-+    {
-+        HeapFree( GetProcessHeap(), 0, key_copy );
-+        return status;
-+    }
-+
-+    *handle_copy = key_copy;
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle )
- {
-     struct key *key = handle;
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index 5d5fae0..d0f0f56 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -14,7 +14,7 @@
- @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey
- @ stub BCryptDestroySecret
- @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash
--@ stub BCryptDuplicateKey
-+@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt
- @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms
- @ stub BCryptEnumContextFunctionProviders
--- 
-2.7.4
-

patches/bcrypt-Improvements/0021-bcrypt-tests-Add-tests-for-BCryptDuplicateKey.patch

@@ -1,77 +0,0 @@
-From 1eed1f80cd5b8fd8e77e02990ebcf3eb7a5bfda5 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 26 Dec 2016 08:30:43 +0100
-Subject: [PATCH 21/36] bcrypt/tests: Add tests for BCryptDuplicateKey.
-
----
- dlls/bcrypt/tests/bcrypt.c | 33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 18cd2a2713..6ec429e309 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -45,6 +45,7 @@ static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID
-                                       ULONG *, ULONG);
- static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG,
-                                       ULONG *, ULONG);
-+static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE);
- static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *,
-                                            PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
-@@ -503,7 +504,7 @@ static void test_BCryptGenerateSymmetricKey(void)
-     static UCHAR expected[] =
-         {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79};
-     BCRYPT_ALG_HANDLE aes;
--    BCRYPT_KEY_HANDLE key;
-+    BCRYPT_KEY_HANDLE key, key2;
-     UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16];
-     ULONG size, len, i;
-     NTSTATUS ret;
-@@ -546,6 +547,35 @@ static void test_BCryptGenerateSymmetricKey(void)
-     for (i = 0; i < 16; i++)
-         ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]);
- 
-+    ret = pBCryptDuplicateKey(NULL, &key2, NULL, 0, 0);
-+    ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret);
-+
-+    if (0) /* crashes on some Windows versions */
-+    {
-+        ret = pBCryptDuplicateKey(key, NULL, NULL, 0, 0);
-+        ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
-+    }
-+
-+    key2 = (void *)0xdeadbeef;
-+    ret = pBCryptDuplicateKey(key, &key2, NULL, 0, 0);
-+    ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER), "got %08x\n", ret);
-+
-+    if (ret == STATUS_SUCCESS)
-+    {
-+        size = 0;
-+        memcpy(ivbuf, iv, sizeof(iv));
-+        memset(ciphertext, 0, sizeof(ciphertext));
-+        ret = pBCryptEncrypt(key2, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0);
-+        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+        ok(size == 16, "got %u\n", size);
-+        ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n");
-+        for (i = 0; i < 16; i++)
-+            ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]);
-+
-+        ret = pBCryptDestroyKey(key2);
-+        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    }
-+
-     size = 0xdeadbeef;
-     ret = pBCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-@@ -1059,6 +1089,7 @@ START_TEST(bcrypt)
-     pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey");
-     pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt");
-     pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt");
-+    pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey");
-     pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey");
-     pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey");
-     pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey");
--- 
-2.16.1
-

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

@@ -1,111 +0,0 @@
-From b41fdf5830cdaf31108cbdf82585f130882a0fb7 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: [PATCH 22/36] bcrypt: Allow to call BCryptSetProperty on key objects.
-
----
- dlls/bcrypt/bcrypt_main.c  | 44 ++++++++++++++++++++++++++++++++++++++++++--
- dlls/bcrypt/tests/bcrypt.c |  4 ++++
- 2 files changed, 46 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index e72a8fd..f027eea 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -246,6 +246,9 @@ struct algorithm
-     BOOL hmac;
- };
- 
-+struct key;
-+static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags );
-+
- NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags)
- {
-     const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG;
-@@ -696,8 +699,8 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
-     }
-     case MAGIC_KEY:
-     {
--        FIXME( "keys not implemented yet\n" );
--        return STATUS_NOT_IMPLEMENTED;
-+        struct key *key = (struct key *)object;
-+        return set_key_property( key, prop, value, size, flags );
-     }
-     default:
-         WARN( "unknown magic %08x\n", object->magic );
-@@ -972,6 +975,31 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
-+{
-+    if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
-+    {
-+        if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size ))
-+        {
-+            key->mode = MODE_ID_CBC;
-+            return STATUS_SUCCESS;
-+        }
-+        else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size ))
-+        {
-+            key->mode = MODE_ID_GCM;
-+            return STATUS_SUCCESS;
-+        }
-+        else
-+        {
-+            FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) );
-+            return STATUS_NOT_IMPLEMENTED;
-+        }
-+    }
-+
-+    FIXME( "unsupported key property %s\n", debugstr_w(prop) );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key )
- {
-     switch (key->alg_id)
-@@ -1126,6 +1154,12 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
-+{
-+    FIXME( "not implemented on Mac\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
- {
-     CCCryptorStatus status;
-@@ -1216,6 +1250,12 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
-+{
-+    ERR( "support for keys not available at build time\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
- {
-     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 6ec429e..baf5b63 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -526,6 +526,10 @@ static void test_BCryptGenerateSymmetricKey(void)
-                             sizeof(BCRYPT_CHAIN_MODE_CBC), 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- 
-+    ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC,
-+                             sizeof(BCRYPT_CHAIN_MODE_CBC), 0);
-+    ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret);
-+
-     size = 0xdeadbeef;
-     ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0);
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
--- 
-2.7.4
-

patches/bcrypt-Improvements/0023-bcrypt-Add-support-for-auth-data-in-AES-GCM-mode.patch

@@ -1,114 +0,0 @@
-From d11095de823d25cd44a80bbdab2745c560db9521 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 26 Dec 2016 15:01:19 +0100
-Subject: [PATCH 23/36] bcrypt: Add support for auth data in AES GCM mode.
-
----
- dlls/bcrypt/bcrypt_main.c | 42 +++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 41 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index f027eea..da9cb02 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
- 
- /* Not present in gnutls version < 3.0 */
- static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size);
-+static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size);
- 
- static void *libgnutls_handle;
- #define MAKE_FUNCPTR(f) static typeof(f) * p##f
-@@ -72,7 +73,12 @@ MAKE_FUNCPTR(gnutls_perror);
- #define GNUTLS_CIPHER_AES_256_GCM 94
- #endif
- 
--static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size)
-+static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size)
-+{
-+    return GNUTLS_E_UNKNOWN_CIPHER_TYPE;
-+}
-+
-+static int compat_gnutls_cipher_add_auth(gnutls_cipher_hd_t handle, const void *ptext, size_t ptext_size)
- {
-     return GNUTLS_E_UNKNOWN_CIPHER_TYPE;
- }
-@@ -115,6 +121,11 @@ static BOOL gnutls_initialize(void)
-         WARN("gnutls_cipher_tag not found\n");
-         pgnutls_cipher_tag = compat_gnutls_cipher_tag;
-     }
-+    if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 )))
-+    {
-+        WARN("gnutls_cipher_add_auth not found\n");
-+        pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth;
-+    }
- 
-     if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS)
-     {
-@@ -1050,6 +1061,19 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len )
-+{
-+    int ret;
-+
-+    if ((ret = pgnutls_cipher_add_auth( key->handle, auth_data, len )))
-+    {
-+        pgnutls_perror( ret );
-+        return STATUS_INTERNAL_ERROR;
-+    }
-+
-+    return STATUS_SUCCESS;
-+}
-+
- static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output,
-                              ULONG output_len )
- {
-@@ -1193,6 +1217,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
-     return STATUS_SUCCESS;
- }
- 
-+static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len )
-+{
-+    FIXME( "not implemented on Mac\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output,
-                              ULONG output_len  )
- {
-@@ -1262,6 +1292,12 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len )
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+static NTSTATUS key_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len )
-+{
-+    ERR( "support for keys not available at build time\n" );
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-+
- static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output,
-                              ULONG output_len  )
- {
-@@ -1456,6 +1492,8 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-         if (!output) return STATUS_SUCCESS;
-         if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL;
- 
-+        if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData )))
-+            return status;
-         if ((status = key_encrypt( key, input, input_len, output, output_len )))
-             return status;
- 
-@@ -1533,6 +1571,8 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp
-         if (!output) return STATUS_SUCCESS;
-         if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL;
- 
-+        if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData )))
-+            return status;
-         if ((status = key_decrypt( key, input, input_len, output, output_len )))
-             return status;
- 
--- 
-2.7.4
-

patches/bcrypt-Improvements/0024-bcrypt-tests-Add-tests-for-auth-data-in-AES-GCM-mode.patch

@@ -1,102 +0,0 @@
-From 7fd1604b8ca60711c6850fbc47189bc9a7fbaa06 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 26 Dec 2016 15:01:38 +0100
-Subject: [PATCH 24/36] bcrypt/tests: Add tests for auth data in AES GCM mode.
-
----
- dlls/bcrypt/tests/bcrypt.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index baf5b638f9..bd22b80d9a 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -610,7 +610,9 @@ static void test_BCryptGenerateSymmetricKey(void)
- static void test_BCryptEncrypt(void)
- {
-     static UCHAR nonce[] =
--        {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60};
-+        {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60};
-+    static UCHAR auth_data[] =
-+        {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10};
-     static UCHAR secret[] =
-         {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
-     static UCHAR iv[] =
-@@ -636,6 +638,8 @@ static void test_BCryptEncrypt(void)
-         {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
-     static UCHAR expected_tag2[] =
-         {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd};
-+    static UCHAR expected_tag3[] =
-+        {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77};
-     BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
-     UCHAR *buf, ciphertext[48], ivbuf[16], tag[16];
-     BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length;
-@@ -809,6 +813,24 @@ static void test_BCryptEncrypt(void)
-     for (i = 0; i < 16; i++)
-         ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
- 
-+    /* test with auth data */
-+    auth_info.pbAuthData = auth_data;
-+    auth_info.cbAuthData = sizeof(auth_data);
-+
-+    size = 0;
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(ciphertext, 0xff, sizeof(ciphertext));
-+    memset(tag, 0xff, sizeof(tag));
-+    ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == 32, "got %u\n", size);
-+    ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n");
-+    ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n");
-+    for (i = 0; i < 32; i++)
-+        ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]);
-+    for (i = 0; i < 16; i++)
-+        ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]);
-+
-     /* test with padding */
-     memcpy(ivbuf, iv, sizeof(iv));
-     memset(ciphertext, 0, sizeof(ciphertext));
-@@ -831,7 +853,9 @@ static void test_BCryptEncrypt(void)
- static void test_BCryptDecrypt(void)
- {
-     static UCHAR nonce[] =
--        {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60};
-+        {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60};
-+    static UCHAR auth_data[] =
-+        {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10};
-     static UCHAR secret[] =
-         {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
-     static UCHAR iv[] =
-@@ -858,6 +882,8 @@ static void test_BCryptDecrypt(void)
-          0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
-     static UCHAR tag[] =
-         {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
-+    static UCHAR tag2[] =
-+        {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77};
-     BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
-     BCRYPT_KEY_LENGTHS_STRUCT key_lengths;
-     BCRYPT_ALG_HANDLE aes;
-@@ -1007,6 +1033,20 @@ static void test_BCryptDecrypt(void)
-     ok(size == 32, "got %u\n", size);
-     ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
- 
-+    /* test with auuth data */
-+    auth_info.pbAuthData = auth_data;
-+    auth_info.cbAuthData = sizeof(auth_data);
-+    auth_info.pbTag = tag2;
-+    auth_info.cbTag = sizeof(tag2);
-+
-+    size = 0;
-+    memcpy(ivbuf, iv, sizeof(iv));
-+    memset(plaintext, 0, sizeof(plaintext));
-+    ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(size == 32, "got %u\n", size);
-+    ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
-+
-     /* test with wrong tag */
-     memcpy(ivbuf, iv, sizeof(iv));
-     auth_info.pbTag = iv; /* wrong tag */
--- 
-2.16.1
-