Hans Leidekker : fusion: Use bcrypt to compute the assembly token.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 358fb2f4d83345cb97a66e4072fe4d2d70f58349
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=358fb2f4d83345cb97a66e407...

Author: Hans Leidekker 
Date:   Wed Feb 27 11:36:02 2019 +0100

fusion: Use bcrypt to compute the assembly token.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46728
Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/fusion/Makefile.in |  2 +-
 dlls/fusion/assembly.c  | 35 ++++++++++-------------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 50815df..093b64c 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = fusion.dll
-IMPORTS   = advapi32 dbghelp shlwapi version user32
+IMPORTS   = bcrypt dbghelp shlwapi version user32

C_SRCS = \
    asmcache.c \
diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c
index ec380ef..78f5278 100644
--- a/dlls/fusion/assembly.c
+++ b/dlls/fusion/assembly.c
@@ -21,11 +21,13 @@
 #include <stdarg.h>
 #include <stdio.h>

+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "winver.h"
-#include "wincrypt.h"
+#include "bcrypt.h"
 #include "dbghelp.h"
 #include "ole2.h"
 #include "fusion.h"
@@ -807,9 +809,8 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token)
 {
     ULONG i, size;
     LONG offset;
-    BYTE *hashdata, *pubkey, *ptr;
-    HCRYPTPROV crypt;
-    HCRYPTHASH hash;
+    BYTE hashdata[20], *pubkey, *ptr;
+    BCRYPT_ALG_HANDLE alg;
     BYTE tokbytes[BYTES_PER_TOKEN];
     HRESULT hr = E_FAIL;
     LPWSTR tok;
@@ -833,29 +834,16 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token)

pubkey = assembly_get_blob(assembly, idx, &size);

-    if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL,
-                              CRYPT_VERIFYCONTEXT))
+    if (BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0) != STATUS_SUCCESS)
         return E_FAIL;

-    if (!CryptCreateHash(crypt, CALG_SHA1, 0, 0, &hash))
-        return E_FAIL;
-
-    if (!CryptHashData(hash, pubkey, size, 0))
-        return E_FAIL;
-
-    size = 0;
-    if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0))
-        return E_FAIL;
-
-    if (!(hashdata = heap_alloc(size)))
+    if (BCryptHash(alg, NULL, 0, pubkey, size, hashdata, sizeof(hashdata)) != STATUS_SUCCESS)
     {
-        hr = E_OUTOFMEMORY;
+        hr = E_FAIL;
         goto done;
     }

-    if (!CryptGetHashParam(hash, HP_HASHVAL, hashdata, &size, 0))
-        goto done;
-
+    size = sizeof(hashdata);
     for (i = size - 1; i >= size - 8; i--)
         tokbytes[size - i - 1] = hashdata[i];

@@ -871,10 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token)
     hr = S_OK;

done:
-    heap_free(hashdata);
-    CryptDestroyHash(hash);
-    CryptReleaseContext(crypt, 0);
-
+    BCryptCloseAlgorithmProvider(alg, 0);
     return hr;
 }