Juan Lang : crypt32: Use public functions when finding certificates.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 25 14:18:22 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 3be75cebe8f2d098cd0e0aebf3f15ee0570d561a
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3be75cebe8f2d098cd0e0aebf3f15ee0570d561a
Author: Juan Lang <juan_lang at yahoo.com>
Date: Thu May 25 08:51:37 2006 -0700
crypt32: Use public functions when finding certificates.
---
dlls/crypt32/cert.c | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 6dc9468..f529668 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -553,7 +553,12 @@ BOOL WINAPI CertCompareIntegerBlob(PCRYP
cb1 = CRYPT_significantBytes(pInt1);
cb2 = CRYPT_significantBytes(pInt2);
if (cb1 == cb2)
- ret = !memcmp(pInt1->pbData, pInt1->pbData, cb1);
+ {
+ if (cb1)
+ ret = !memcmp(pInt1->pbData, pInt1->pbData, cb1);
+ else
+ ret = TRUE;
+ }
else
ret = FALSE;
return ret;
@@ -634,32 +639,25 @@ static BOOL compare_cert_by_sha1_hash(PC
static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType,
DWORD dwFlags, const void *pvPara)
{
- const CERT_NAME_BLOB *blob = (const CERT_NAME_BLOB *)pvPara, *toCompare;
+ CERT_NAME_BLOB *blob = (CERT_NAME_BLOB *)pvPara, *toCompare;
BOOL ret;
if (dwType & CERT_INFO_SUBJECT_FLAG)
toCompare = &pCertContext->pCertInfo->Subject;
else
toCompare = &pCertContext->pCertInfo->Issuer;
- if (toCompare->cbData == blob->cbData)
- ret = !memcmp(toCompare->pbData, blob->pbData, blob->cbData);
- else
- ret = FALSE;
+ ret = CertCompareCertificateName(pCertContext->dwCertEncodingType,
+ toCompare, blob);
return ret;
}
static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext,
DWORD dwType, DWORD dwFlags, const void *pvPara)
{
- const CERT_INFO *pCertInfo = (const CERT_INFO *)pvPara;
- BOOL ret;
+ CERT_INFO *pCertInfo = (CERT_INFO *)pvPara;
- if (pCertInfo->Issuer.cbData == pCertContext->pCertInfo->Subject.cbData)
- ret = !memcmp(pCertInfo->Issuer.pbData,
- pCertContext->pCertInfo->Subject.pbData, pCertInfo->Issuer.cbData);
- else
- ret = FALSE;
- return ret;
+ return CertCompareCertificateName(pCertContext->dwCertEncodingType,
+ &pCertInfo->Issuer, &pCertContext->pCertInfo->Subject);
}
static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext,
More information about the wine-cvs
mailing list