Correct crypt context init in CryptProtectData/CryptUnprotectData.

5eb46095 · Kees Cook · Alexandre Julliard · 54acd10d · 5eb46095
Commit 5eb46095 authored May 23, 2005 by Kees Cook Committed by Alexandre Julliard May 23, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

protectdata.c dlls/crypt32/protectdata.c +4 -2

No files found.
--- a/dlls/crypt32/protectdata.c
+++ b/dlls/crypt32/protectdata.c
@@ -861,7 +861,8 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
        szDataDescr=(WCHAR[]){'\0'};

    /* get crypt context */
-    if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,0))
+    if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,0) &&
+        !CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_NEWKEYSET))
    {
        ERR("CryptAcquireContextW failed\n");
        goto finished;
@@ -1042,7 +1043,8 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn,
    }

    /* get a crypt context */
-    if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,0))
+    if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,0) &&
+        !CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_NEWKEYSET))
    {
        ERR("CryptAcquireContextW failed\n");
        goto free_protect_data;