[PATCH 1/5] crypt32: Rename "crl" and "cloned" to "dst" and "src" in CRL_clone().
Zebediah Figura
zfigura at codeweavers.com
Thu Jul 15 11:25:16 CDT 2021
"cloned" is very ambiguous and can be interpreted as the destination rather than
the source.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/crypt32/crl.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index 31bf35bd041..4dc77c2a246 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -40,40 +40,38 @@ static const context_vtbl_t crl_vtbl;
static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link)
{
- crl_t *crl;
+ crl_t *dst;
if(use_link) {
- crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store);
- if(!crl)
+ if (!(dst = (crl_t *)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store)))
return NULL;
}else {
- const crl_t *cloned = (const crl_t*)context;
+ const crl_t *src = (const crl_t*)context;
DWORD size = 0;
BOOL res;
- crl = (crl_t*)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store);
- if(!crl)
+ if (!(dst = (crl_t *)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store)))
return NULL;
- Context_CopyProperties(&crl->ctx, &cloned->ctx);
+ Context_CopyProperties(&dst->ctx, &src->ctx);
- crl->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType;
- crl->ctx.pbCrlEncoded = CryptMemAlloc(cloned->ctx.cbCrlEncoded);
- memcpy(crl->ctx.pbCrlEncoded, cloned->ctx.pbCrlEncoded, cloned->ctx.cbCrlEncoded);
- crl->ctx.cbCrlEncoded = cloned->ctx.cbCrlEncoded;
+ dst->ctx.dwCertEncodingType = src->ctx.dwCertEncodingType;
+ dst->ctx.pbCrlEncoded = CryptMemAlloc(src->ctx.cbCrlEncoded);
+ memcpy(dst->ctx.pbCrlEncoded, src->ctx.pbCrlEncoded, src->ctx.cbCrlEncoded);
+ dst->ctx.cbCrlEncoded = src->ctx.cbCrlEncoded;
- /* FIXME: We don't need to decode the object here, we could just clone crl info. */
- res = CryptDecodeObjectEx(crl->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED,
- crl->ctx.pbCrlEncoded, crl->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
- &crl->ctx.pCrlInfo, &size);
+ /* FIXME: We don't need to decode the object here, we could just clone dst info. */
+ res = CryptDecodeObjectEx(dst->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED,
+ dst->ctx.pbCrlEncoded, dst->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
+ &dst->ctx.pCrlInfo, &size);
if(!res) {
- CertFreeCRLContext(&crl->ctx);
+ CertFreeCRLContext(&dst->ctx);
return NULL;
}
}
- crl->ctx.hCertStore = store;
- return &crl->base;
+ dst->ctx.hCertStore = store;
+ return &dst->base;
}
static const context_vtbl_t crl_vtbl = {
--
2.30.2
More information about the wine-devel
mailing list