diff --git a/patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch b/patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch index a9f71d00..a76c39a1 100644 --- a/patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch +++ b/patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch @@ -1,4 +1,4 @@ -From 8ebad635c033bf41392e23ee50494195fdce73b9 Mon Sep 17 00:00:00 2001 +From 480ec9b4f559237e618ede31ecd158340783ab80 Mon Sep 17 00:00:00 2001 From: Maxime Lombard Date: Sun, 10 Jun 2018 14:50:31 +0200 Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub. @@ -6,14 +6,15 @@ Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 6 ++++++ + dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 1 + - 3 files changed, 8 insertions(+), 1 deletion(-) + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec -index f4d9a57..1e81ad1 100644 +index 78824d7..ccfec63 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ @ stdcall BCryptFinishHash(ptr ptr long long) @ stub BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) @@ -23,7 +24,7 @@ index f4d9a57..1e81ad1 100644 @ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 003e8f3..0d94634 100644 +index 0381b65..623ccb5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -160,6 +160,12 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c @@ -39,11 +40,24 @@ index 003e8f3..0d94634 100644 NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; +diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec +index e7b12e0..e667e75 100644 +--- a/dlls/ncrypt/ncrypt.spec ++++ b/dlls/ncrypt/ncrypt.spec +@@ -27,7 +27,7 @@ + @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash + @ stub BCryptFreeBuffer + @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +-@ stub BCryptGenerateKeyPair ++@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair + @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey + @ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode + @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty diff --git a/include/bcrypt.h b/include/bcrypt.h -index 676db72..ce11685 100644 +index 7966f76..2ef073b 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h -@@ -224,6 +224,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE); +@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); diff --git a/patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch b/patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch index 1408846d..d62a3879 100644 --- a/patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch +++ b/patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch @@ -1,4 +1,4 @@ -From 046863d1eb6db25555743cbbc257260387b31c19 Mon Sep 17 00:00:00 2001 +From e765bec7193e3ffa27492abe76ed4e56db0f4fc7 Mon Sep 17 00:00:00 2001 From: Maxime Lombard Date: Sun, 10 Jun 2018 14:52:31 +0200 Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub. @@ -6,14 +6,15 @@ Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 6 ++++++ + dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 1 + - 3 files changed, 8 insertions(+), 1 deletion(-) + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec -index 1e81ad1..052a099 100644 +index ccfec63..891381f 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) @@ -23,7 +24,7 @@ index 1e81ad1..052a099 100644 @ stub BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c -index 0d94634..40a3405 100644 +index 623ccb5..90af6aa 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -166,6 +166,12 @@ NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HA @@ -39,11 +40,24 @@ index 0d94634..40a3405 100644 NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; +diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec +index e667e75..c6e7f7f 100644 +--- a/dlls/ncrypt/ncrypt.spec ++++ b/dlls/ncrypt/ncrypt.spec +@@ -23,7 +23,7 @@ + @ stub BCryptEnumProviders + @ stub BCryptEnumRegisteredProviders + @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey +-@ stub BCryptFinalizeKeyPair ++@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair + @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash + @ stub BCryptFreeBuffer + @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom diff --git a/include/bcrypt.h b/include/bcrypt.h -index ce11685..b8e93a6 100644 +index 2ef073b..6826c86 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h -@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); +@@ -222,6 +222,7 @@ 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); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);