cryptnet: Resolve object id to algorithm id when verifying OCSP response.

Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102Signed-off-by: Torge Matthies <tmatthies@codeweavers.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

cryptnet: Resolve object id to algorithm id when verifying OCSP response.
16e6067d · Torge Matthies · Alexandre Julliard · cdb80abc · 16e6067d
Commit 16e6067d authored Jun 06, 2022 by Torge Matthies Committed by Alexandre Julliard Jun 06, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cryptnet_main.c dlls/cryptnet/cryptnet_main.c +3 -2

No files found.
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_
    HCRYPTPROV prov = 0;
    HCRYPTHASH hash = 0;
    HCRYPTKEY key = 0;
+    DWORD algid;

    if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData,
                             CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError();
@@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_
    if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done;

    alg = &info->SignatureInfo.SignatureAlgorithm;
-    if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA))
+    if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId)))
    {
        FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId));
        error = CRYPT_E_NO_REVOCATION_CHECK;
@@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_
    }

    if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done;
-    if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done;
+    if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done;
    if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done;

    sig = &info->SignatureInfo.Signature;