dssenh: Return NTE_BAD_KEYSET when key cannot be opened.

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

dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
cf770571 · Rémi Bernon · Alexandre Julliard · c5bdc240 · cf770571 · cf770571
Commit cf770571 authored May 25, 2021 by Rémi Bernon Committed by Alexandre Julliard May 25, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

main.c dlls/dssenh/main.c +2 -1

dssenh.c dlls/dssenh/tests/dssenh.c +1 -1

No files found.
--- 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:

--- 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);
    }