Rémi Bernon : dssenh: Return NTE_BAD_KEYSET when key cannot be opened.

[Alexandre Julliard]

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

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue May 25 17:37:11 2021 +0200

dssenh: Return NTE_BAD_KEYSET when key cannot be opened.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dssenh/main.c         | 3 ++-
 dlls/dssenh/tests/dssenh.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c
index 6cfa04393fd..b03c05195cd 100644
--- a/dlls/dssenh/main.c
+++ b/dlls/dssenh/main.c
@@ -284,7 +284,8 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags
     {
     case 0:
     case 0 | CRYPT_MACHINE_KEYSET:
-        ret = read_key_container( name, flags );
+        if (!(ret = read_key_container( name, flags )))
+            SetLastError( NTE_BAD_KEYSET );
         break;
 
     case CRYPT_NEWKEYSET:
diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c
index b72b1e3a614..f0fe4a02f97 100644
--- a/dlls/dssenh/tests/dssenh.c
+++ b/dlls/dssenh/tests/dssenh.c
@@ -75,7 +75,7 @@ static void test_acquire_context(void)
     result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0);
     if (!result)
     {
-        todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError());
+        ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError());
         SetLastError(0xdeadbeef);
         result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET);
     }