diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 8b5f2e85043..3d2b3def9d6 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -83,7 +83,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, - (BYTE *)&certInfo, &size); + &certInfo, &size); if (ret) { BYTE *data = NULL; @@ -107,7 +107,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, } end: - return (PCCERT_CONTEXT)cert; + return cert; } PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( @@ -120,7 +120,7 @@ PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( static void CertDataContext_Free(void *context) { - PCERT_CONTEXT certContext = (PCERT_CONTEXT)context; + PCERT_CONTEXT certContext = context; CryptMemFree(certContext->pbCertEncoded); LocalFree(certContext->pCertInfo); @@ -140,7 +140,7 @@ DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext, DWORD dwPropId) { PCONTEXT_PROPERTY_LIST properties = Context_GetProperties( - (void *)pCertContext, sizeof(CERT_CONTEXT)); + pCertContext, sizeof(CERT_CONTEXT)); DWORD ret; TRACE("(%p, %d)\n", pCertContext, dwPropId); @@ -191,7 +191,7 @@ static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, static BOOL CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData) { - PCCERT_CONTEXT pCertContext = (PCCERT_CONTEXT)context; + PCCERT_CONTEXT pCertContext = context; PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CERT_CONTEXT)); BOOL ret; @@ -349,7 +349,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData, pcbData); if (ret && pvData) - CRYPT_FixKeyProvInfoPointers((PCRYPT_KEY_PROV_INFO)pvData); + CRYPT_FixKeyProvInfoPointers(pvData); break; default: ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData, @@ -920,7 +920,7 @@ static BOOL compare_cert_by_md5_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, CERT_MD5_HASH_PROP_ID, hash, &size); if (ret) { - const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + const CRYPT_HASH_BLOB *pHash = pvPara; if (size == pHash->cbData) ret = !memcmp(pHash->pbData, hash, size); @@ -941,7 +941,7 @@ static BOOL compare_cert_by_sha1_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, CERT_SHA1_HASH_PROP_ID, hash, &size); if (ret) { - const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + const CRYPT_HASH_BLOB *pHash = pvPara; if (size == pHash->cbData) ret = !memcmp(pHash->pbData, hash, size); @@ -1043,7 +1043,7 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { BOOL ret = FALSE; - PCCERT_CONTEXT subject = (PCCERT_CONTEXT)pvPara; + PCCERT_CONTEXT subject = pvPara; PCERT_EXTENSION ext; DWORD size; @@ -1146,7 +1146,7 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - PCCERT_CONTEXT toCompare = (PCCERT_CONTEXT)pvPara; + PCCERT_CONTEXT toCompare = pvPara; return CertCompareCertificate(pCertContext->dwCertEncodingType, pCertContext->pCertInfo, toCompare->pCertInfo); } @@ -1154,7 +1154,7 @@ static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - const CRYPT_HASH_BLOB *hash = (const CRYPT_HASH_BLOB *)pvPara; + const CRYPT_HASH_BLOB *hash = pvPara; DWORD size = 0; BOOL ret; @@ -1586,7 +1586,7 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, pbEncoded, cbEncoded, pbComputedHash, *pcbComputedHash); ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, - pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (void *)&info, &size); + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); if (ret) { PCCRYPT_OID_INFO oidInfo; @@ -1808,7 +1808,7 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, { case CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB: { - PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvSubject; + PCRYPT_DATA_BLOB blob = pvSubject; subjectBlob.pbData = blob->pbData; subjectBlob.cbData = blob->cbData; @@ -1816,7 +1816,7 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, } case CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT: { - PCERT_CONTEXT context = (PCERT_CONTEXT)pvSubject; + PCERT_CONTEXT context = pvSubject; subjectBlob.pbData = context->pbCertEncoded; subjectBlob.cbData = context->cbCertEncoded; @@ -1824,7 +1824,7 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, } case CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL: { - PCRL_CONTEXT context = (PCRL_CONTEXT)pvSubject; + PCRL_CONTEXT context = pvSubject; subjectBlob.pbData = context->pbCrlEncoded; subjectBlob.cbData = context->cbCrlEncoded; @@ -1843,14 +1843,14 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, subjectBlob.pbData, subjectBlob.cbData, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&signedCert, &size); + &signedCert, &size); if (ret) { switch (dwIssuerType) { case CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY: ret = CRYPT_VerifyCertSignatureFromPublicKeyInfo(hCryptProv, - dwCertEncodingType, (PCERT_PUBLIC_KEY_INFO)pvIssuer, + dwCertEncodingType, pvIssuer, signedCert); break; case CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT: @@ -2458,7 +2458,7 @@ static PCCERT_CONTEXT CRYPT_CreateSignedCert(const CRYPT_DER_BLOB *blob, signedInfo.Signature.cUnusedBits = 0; ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &signedInfo, CRYPT_ENCODE_ALLOC_FLAG, NULL, - (BYTE *)&encodedSignedCert, &encodedSignedCertSize); + &encodedSignedCert, &encodedSignedCertSize); if (ret) { context = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -2687,7 +2687,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN CRYPT_MakeCertInfo(&info, &serialBlob, pSubjectIssuerBlob, pSignatureAlgorithm, pStartTime, pEndTime, pubKey, pExtensions); ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, - &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&blob.pbData, + &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &blob.pbData, &blob.cbData); if (ret) { diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e7133620573..6d7bb54e2d6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -144,7 +144,7 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, else engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; } - return (HCERTCHAINENGINE)engine; + return engine; } BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, @@ -383,7 +383,7 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, ret = CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_BASIC_CONSTRAINTS, ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, - NULL, (LPBYTE)&info, &size); + NULL, &info, &size); if (ret) { if (info->SubjectType.cbData == 1) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 41b644a841e..be8eddfe034 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -42,7 +42,7 @@ typedef struct _WINE_COLLECTIONSTORE static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + PWINE_COLLECTIONSTORE cs = store; PWINE_STORE_LIST_ENTRY entry, next; TRACE("(%p, %08x)\n", store, dwFlags); @@ -51,12 +51,12 @@ static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) entry) { TRACE("closing %p\n", entry); - CertCloseStore((HCERTSTORE)entry->store, dwFlags); + CertCloseStore(entry->store, dwFlags); CryptMemFree(entry); } cs->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&cs->cs); - CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store); + CRYPT_FreeStore(store); } static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, @@ -205,7 +205,7 @@ static BOOL CRYPT_CollectionAddCert(PWINECRYPT_CERTSTORE store, void *cert, context->hCertStore = store; *ppStoreContext = context; } - CertFreeCertificateContext((PCCERT_CONTEXT)childContext); + CertFreeCertificateContext(childContext); return ret; } @@ -258,7 +258,7 @@ static BOOL CRYPT_CollectionDeleteCert(PWINECRYPT_CERTSTORE store, TRACE("(%p, %p)\n", store, pCertContext); - ret = CertDeleteCertificateFromStore((PCCERT_CONTEXT) + ret = CertDeleteCertificateFromStore( Context_GetLinkedContext(pCertContext, sizeof(CERT_CONTEXT))); return ret; } @@ -284,7 +284,7 @@ static BOOL CRYPT_CollectionAddCRL(PWINECRYPT_CERTSTORE store, void *crl, context->hCertStore = store; *ppStoreContext = context; } - CertFreeCRLContext((PCCRL_CONTEXT)childContext); + CertFreeCRLContext(childContext); return ret; } @@ -336,7 +336,7 @@ static BOOL CRYPT_CollectionDeleteCRL(PWINECRYPT_CERTSTORE store, TRACE("(%p, %p)\n", store, pCrlContext); - ret = CertDeleteCRLFromStore((PCCRL_CONTEXT) + ret = CertDeleteCRLFromStore( Context_GetLinkedContext(pCrlContext, sizeof(CRL_CONTEXT))); return ret; } @@ -362,7 +362,7 @@ static BOOL CRYPT_CollectionAddCTL(PWINECRYPT_CERTSTORE store, void *ctl, context->hCertStore = store; *ppStoreContext = context; } - CertFreeCTLContext((PCCTL_CONTEXT)childContext); + CertFreeCTLContext(childContext); return ret; } @@ -414,7 +414,7 @@ static BOOL CRYPT_CollectionDeleteCTL(PWINECRYPT_CERTSTORE store, TRACE("(%p, %p)\n", store, pCtlContext); - ret = CertDeleteCTLFromStore((PCCTL_CONTEXT) + ret = CertDeleteCTLFromStore( Context_GetLinkedContext(pCtlContext, sizeof(CTL_CONTEXT))); return ret; } @@ -457,8 +457,8 @@ PWINECRYPT_CERTSTORE CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority) { - PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore; - WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore; + PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINECRYPT_CERTSTORE *sibling = hSiblingStore; PWINE_STORE_LIST_ENTRY entry; BOOL ret; @@ -525,8 +525,8 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore) { - PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore; - WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore; + PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINECRYPT_CERTSTORE *sibling = hSiblingStore; PWINE_STORE_LIST_ENTRY store, next; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index fa7922f84e0..f7ebebb1c48 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -171,8 +171,8 @@ void Context_CopyProperties(const void *to, const void *from, { PCONTEXT_PROPERTY_LIST toProperties, fromProperties; - toProperties = Context_GetProperties((void *)to, contextSize); - fromProperties = Context_GetProperties((void *)from, contextSize); + toProperties = Context_GetProperties(to, contextSize); + fromProperties = Context_GetProperties(from, contextSize); assert(toProperties && fromProperties); ContextPropertyList_Copy(toProperties, fromProperties); } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index a1138b5ed67..271e4e0c1b4 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -45,7 +45,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, } ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, pbCrlEncoded, cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, - (BYTE *)&crlInfo, &size); + &crlInfo, &size); if (ret) { BYTE *data = NULL; @@ -69,7 +69,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, } end: - return (PCCRL_CONTEXT)crl; + return crl; } BOOL WINAPI CertAddEncodedCRLToStore(HCERTSTORE hCertStore, @@ -110,7 +110,7 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, if (pvPara) { - PCCERT_CONTEXT issuer = (PCCERT_CONTEXT)pvPara; + PCCERT_CONTEXT issuer = pvPara; ret = CertCompareCertificateName(issuer->dwCertEncodingType, &issuer->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); @@ -127,7 +127,7 @@ static BOOL compare_crl_existing(PCCRL_CONTEXT pCrlContext, DWORD dwType, if (pvPara) { - PCCRL_CONTEXT crl = (PCCRL_CONTEXT)pvPara; + PCCRL_CONTEXT crl = pvPara; ret = CertCompareCertificateName(pCrlContext->dwCertEncodingType, &pCrlContext->pCrlInfo->Issuer, &crl->pCrlInfo->Issuer); @@ -234,7 +234,7 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) static void CrlDataContext_Free(void *context) { - PCRL_CONTEXT crlContext = (PCRL_CONTEXT)context; + PCRL_CONTEXT crlContext = context; CryptMemFree(crlContext->pbCrlEncoded); LocalFree(crlContext->pCrlInfo); @@ -254,7 +254,7 @@ DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext, DWORD dwPropId) { PCONTEXT_PROPERTY_LIST properties = Context_GetProperties( - (void *)pCRLContext, sizeof(CRL_CONTEXT)); + pCRLContext, sizeof(CRL_CONTEXT)); DWORD ret; TRACE("(%p, %d)\n", pCRLContext, dwPropId); @@ -428,7 +428,7 @@ static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, } case CERT_DATE_STAMP_PROP_ID: ret = ContextPropertyList_SetProperty(properties, dwPropId, - (const BYTE *)pvData, sizeof(FILETIME)); + pvData, sizeof(FILETIME)); break; default: FIXME("%d: stub\n", dwPropId); diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 42abcd73346..5a6d19b64fe 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -36,7 +36,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, PCCTL_CONTEXT* ppStoreContext) { - PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + PWINECRYPT_CERTSTORE store = hCertStore; BOOL ret = TRUE; PCCTL_CONTEXT toAdd = NULL, existing = NULL; @@ -161,7 +161,7 @@ BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore, PCCTL_CONTEXT pPrev) { - WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore; + WINECRYPT_CERTSTORE *hcs = hCertStore; PCCTL_CONTEXT ret; TRACE("(%p, %p)\n", hCertStore, pPrev); @@ -194,7 +194,7 @@ static BOOL compare_ctl_by_md5_hash(PCCTL_CONTEXT pCtlContext, DWORD dwType, &size); if (ret) { - const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + const CRYPT_HASH_BLOB *pHash = pvPara; if (size == pHash->cbData) ret = !memcmp(pHash->pbData, hash, size); @@ -215,7 +215,7 @@ static BOOL compare_ctl_by_sha1_hash(PCCTL_CONTEXT pCtlContext, DWORD dwType, &size); if (ret) { - const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara; + const CRYPT_HASH_BLOB *pHash = pvPara; if (size == pHash->cbData) ret = !memcmp(pHash->pbData, hash, size); @@ -232,7 +232,7 @@ static BOOL compare_ctl_existing(PCCTL_CONTEXT pCtlContext, DWORD dwType, if (pvPara) { - PCCTL_CONTEXT ctl = (PCCTL_CONTEXT)pvPara; + PCCTL_CONTEXT ctl = pvPara; if (pCtlContext->cbCtlContext == ctl->cbCtlContext) { @@ -315,8 +315,7 @@ BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) } else { - PWINECRYPT_CERTSTORE hcs = - (PWINECRYPT_CERTSTORE)pCtlContext->hCertStore; + PWINECRYPT_CERTSTORE hcs = pCtlContext->hCertStore; if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) ret = FALSE; @@ -400,7 +399,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, { ret = CryptDecodeObjectEx(dwMsgAndCertEncodingType, PKCS_CTL, content, contentSize, CRYPT_DECODE_ALLOC_FLAG, NULL, - (BYTE *)&ctlInfo, &size); + &ctlInfo, &size); if (ret) { ctl = Context_CreateDataContext(sizeof(CTL_CONTEXT)); @@ -450,7 +449,7 @@ end: CryptMemFree(content); CryptMsgClose(msg); } - return (PCCTL_CONTEXT)ctl; + return ctl; } PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) @@ -462,7 +461,7 @@ PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) static void CTLDataContext_Free(void *context) { - PCTL_CONTEXT ctlContext = (PCTL_CONTEXT)context; + PCTL_CONTEXT ctlContext = context; CryptMsgClose(ctlContext->hCryptMsg); CryptMemFree(ctlContext->pbCtlEncoded); @@ -484,7 +483,7 @@ DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, DWORD dwPropId) { PCONTEXT_PROPERTY_LIST properties = Context_GetProperties( - (void *)pCTLContext, sizeof(CTL_CONTEXT)); + pCTLContext, sizeof(CTL_CONTEXT)); DWORD ret; TRACE("(%p, %d)\n", pCTLContext, dwPropId); @@ -656,7 +655,7 @@ static BOOL CTLContext_SetProperty(PCCTL_CONTEXT context, DWORD dwPropId, } case CERT_DATE_STAMP_PROP_ID: ret = ContextPropertyList_SetProperty(properties, dwPropId, - (const BYTE *)pvData, sizeof(FILETIME)); + pvData, sizeof(FILETIME)); break; default: FIXME("%d: stub\n", dwPropId); diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 2440d1696f1..277be833623 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -228,8 +228,7 @@ BOOL WINAPI CRYPT_AsnEncodeConstructed(DWORD dwCertEncodingType, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret; - const struct AsnConstructedItem *item = - (const struct AsnConstructedItem *)pvStructInfo; + const struct AsnConstructedItem *item = pvStructInfo; DWORD len; if ((ret = item->encodeFunc(dwCertEncodingType, lpszStructType, @@ -283,8 +282,7 @@ static BOOL WINAPI CRYPT_AsnEncodeSwapTag(DWORD dwCertEncodingType, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret; - const struct AsnEncodeTagSwappedItem *item = - (const struct AsnEncodeTagSwappedItem *)pvStructInfo; + const struct AsnEncodeTagSwappedItem *item = pvStructInfo; ret = item->encodeFunc(dwCertEncodingType, lpszStructType, item->pvStructInfo, dwFlags, pEncodePara, pbEncoded, pcbEncoded); @@ -297,7 +295,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertVersion(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const DWORD *ver = (const DWORD *)pvStructInfo; + const DWORD *ver = pvStructInfo; BOOL ret; /* CERT_V1 is not encoded */ @@ -320,7 +318,7 @@ static BOOL WINAPI CRYPT_CopyEncodedBlob(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_DER_BLOB *blob = (const CRYPT_DER_BLOB *)pvStructInfo; + const CRYPT_DER_BLOB *blob = pvStructInfo; BOOL ret; if (!pbEncoded) @@ -350,7 +348,7 @@ static BOOL WINAPI CRYPT_AsnEncodeValidity(DWORD dwCertEncodingType, { BOOL ret; /* This has two filetimes in a row, a NotBefore and a NotAfter */ - const FILETIME *timePtr = (const FILETIME *)pvStructInfo; + const FILETIME *timePtr = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { timePtr, CRYPT_AsnEncodeChoiceOfTime, 0 }, { timePtr + 1, CRYPT_AsnEncodeChoiceOfTime, 0 }, @@ -370,8 +368,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_ALGORITHM_IDENTIFIER *algo = - (const CRYPT_ALGORITHM_IDENTIFIER *)pvStructInfo; + const CRYPT_ALGORITHM_IDENTIFIER *algo = pvStructInfo; static const BYTE asn1Null[] = { ASN_NULL, 0 }; static const CRYPT_DATA_BLOB nullBlob = { sizeof(asn1Null), (LPBYTE)asn1Null }; @@ -395,8 +392,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_ALGORITHM_IDENTIFIER *algo = - (const CRYPT_ALGORITHM_IDENTIFIER *)pvStructInfo; + const CRYPT_ALGORITHM_IDENTIFIER *algo = pvStructInfo; BOOL ret; struct AsnEncodeSequenceItem items[] = { { algo->pszObjId, CRYPT_AsnEncodeOid, 0 }, @@ -417,8 +413,7 @@ static BOOL WINAPI CRYPT_AsnEncodePubKeyInfo(DWORD dwCertEncodingType, __TRY { - const CERT_PUBLIC_KEY_INFO *info = - (const CERT_PUBLIC_KEY_INFO *)pvStructInfo; + const CERT_PUBLIC_KEY_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { &info->Algorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, { &info->PublicKey, CRYPT_AsnEncodeBits, 0 }, @@ -447,8 +442,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCert(DWORD dwCertEncodingType, __TRY { - const CERT_SIGNED_CONTENT_INFO *info = - (const CERT_SIGNED_CONTENT_INFO *)pvStructInfo; + const CERT_SIGNED_CONTENT_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { &info->ToBeSigned, CRYPT_CopyEncodedBlob, 0 }, { &info->SignatureAlgorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, @@ -482,7 +476,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertInfo(DWORD dwCertEncodingType, __TRY { - const CERT_INFO *info = (const CERT_INFO *)pvStructInfo; + const CERT_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[10] = { { &info->dwVersion, CRYPT_AsnEncodeCertVersion, 0 }, { &info->SerialNumber, CRYPT_AsnEncodeInteger, 0 }, @@ -619,7 +613,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLVersion(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const DWORD *ver = (const DWORD *)pvStructInfo; + const DWORD *ver = pvStructInfo; BOOL ret; /* CRL_V1 is not encoded */ @@ -646,7 +640,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLInfo(DWORD dwCertEncodingType, __TRY { - const CRL_INFO *info = (const CRL_INFO *)pvStructInfo; + const CRL_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[7] = { { &info->dwVersion, CRYPT_AsnEncodeCRLVersion, 0 }, { &info->SignatureAlgorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, @@ -730,7 +724,7 @@ static BOOL WINAPI CRYPT_AsnEncodeExtensions(DWORD dwCertEncodingType, __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; - const CERT_EXTENSIONS *exts = (const CERT_EXTENSIONS *)pvStructInfo; + const CERT_EXTENSIONS *exts = pvStructInfo; ret = TRUE; for (i = 0, dataLen = 0; ret && i < exts->cExtension; i++) @@ -783,7 +777,7 @@ BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - LPCSTR pszObjId = (LPCSTR)pvStructInfo; + LPCSTR pszObjId = pvStructInfo; DWORD bytesNeeded = 0, lenBytes; BOOL ret = TRUE; int firstPos = 0; @@ -1007,7 +1001,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType, __TRY { - const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo; + const CERT_NAME_VALUE *value = pvStructInfo; switch (value->dwValueType) { @@ -1098,8 +1092,8 @@ static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, /* hack: a CERT_RDN_ATTR is identical to a CERT_NAME_VALUE beginning * with dwValueType, so "cast" it to get its encoded size */ - ret = nameValueEncodeFunc(dwCertEncodingType, NULL, - (CERT_NAME_VALUE *)&attr->dwValueType, 0, NULL, NULL, &size); + ret = nameValueEncodeFunc(dwCertEncodingType, NULL, &attr->dwValueType, + 0, NULL, NULL, &size); if (ret) { bytesNeeded += size; @@ -1125,9 +1119,8 @@ static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, { pbEncoded += size; size = bytesNeeded - 1 - lenBytes - size; - ret = nameValueEncodeFunc(dwCertEncodingType, - NULL, (CERT_NAME_VALUE *)&attr->dwValueType, - 0, NULL, pbEncoded, &size); + ret = nameValueEncodeFunc(dwCertEncodingType, NULL, + &attr->dwValueType, 0, NULL, pbEncoded, &size); if (!ret) *pcbEncoded = size; } @@ -1147,7 +1140,7 @@ static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, static int BLOBComp(const void *l, const void *r) { - const CRYPT_DER_BLOB *a = (const CRYPT_DER_BLOB *)l, *b = (const CRYPT_DER_BLOB *)r; + const CRYPT_DER_BLOB *a = l, *b = r; int ret; if (!(ret = memcmp(a->pbData, b->pbData, min(a->cbData, b->cbData)))) @@ -1161,7 +1154,7 @@ static BOOL WINAPI CRYPT_DEREncodeSet(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_BLOB_ARRAY *set = (const CRYPT_BLOB_ARRAY *)pvStructInfo; + const CRYPT_BLOB_ARRAY *set = pvStructInfo; DWORD bytesNeeded = 0, lenBytes, i; BOOL ret; @@ -1205,8 +1198,7 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const struct DERSetDescriptor *desc = - (const struct DERSetDescriptor *)pvStructInfo; + const struct DERSetDescriptor *desc = pvStructInfo; CRYPT_BLOB_ARRAY setOf = { 0, NULL }; BOOL ret = TRUE; DWORD i; @@ -1344,7 +1336,7 @@ static BOOL WINAPI CRYPT_AsnEncodeOrCopyUnicodeNameValue( DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo; + const CERT_NAME_VALUE *value = pvStructInfo; BOOL ret; if (value->dwValueType == CERT_RDN_ENCODED_BLOB) @@ -1364,7 +1356,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeName(DWORD dwCertEncodingType, __TRY { - const CERT_NAME_INFO *info = (const CERT_NAME_INFO *)pvStructInfo; + const CERT_NAME_INFO *info = pvStructInfo; DWORD bytesNeeded = 0, lenBytes, size, i; TRACE("encoding name with %d RDNs\n", info->cRDN); @@ -1426,7 +1418,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTLVersion(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const DWORD *ver = (const DWORD *)pvStructInfo; + const DWORD *ver = pvStructInfo; BOOL ret; /* CTL_V1 is not encoded */ @@ -1449,8 +1441,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTLSubjectAlgorithm( DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_ALGORITHM_IDENTIFIER *algo = - (const CRYPT_ALGORITHM_IDENTIFIER *)pvStructInfo; + const CRYPT_ALGORITHM_IDENTIFIER *algo = pvStructInfo; BOOL ret; struct AsnEncodeSequenceItem items[2] = { { algo->pszObjId, CRYPT_AsnEncodeOid, 0 }, @@ -1501,7 +1492,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTLEntries(DWORD dwCertEncodingType, { BOOL ret; DWORD bytesNeeded, dataLen, lenBytes, i; - const struct CTLEntries *entries = (const struct CTLEntries *)pvStructInfo; + const struct CTLEntries *entries = pvStructInfo; ret = TRUE; for (i = 0, dataLen = 0; ret && i < entries->cEntry; i++) @@ -1551,7 +1542,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTL(DWORD dwCertEncodingType, __TRY { - const CTL_INFO *info = (const CTL_INFO *)pvStructInfo; + const CTL_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[9] = { { &info->dwVersion, CRYPT_AsnEncodeCTLVersion, 0 }, { &info->SubjectUsage, CRYPT_AsnEncodeEnhancedKeyUsage, 0 }, @@ -1617,8 +1608,7 @@ static BOOL CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, __TRY { - const CRYPT_SMIME_CAPABILITY *capability = - (const CRYPT_SMIME_CAPABILITY *)pvStructInfo; + const CRYPT_SMIME_CAPABILITY *capability = pvStructInfo; if (!capability->pszObjId) SetLastError(E_INVALIDARG); @@ -1651,8 +1641,7 @@ static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; - const CRYPT_SMIME_CAPABILITIES *capabilities = - (const CRYPT_SMIME_CAPABILITIES *)pvStructInfo; + const CRYPT_SMIME_CAPABILITIES *capabilities = pvStructInfo; ret = TRUE; for (i = 0, dataLen = 0; ret && i < capabilities->cCapability; i++) @@ -1818,7 +1807,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, __TRY { - const CRYPT_ATTRIBUTE *attr = (const CRYPT_ATTRIBUTE *)pvStructInfo; + const CRYPT_ATTRIBUTE *attr = pvStructInfo; if (!attr->pszObjId) SetLastError(E_INVALIDARG); @@ -1850,8 +1839,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSAttributes(DWORD dwCertEncodingType, __TRY { - const CRYPT_ATTRIBUTES *attributes = - (const CRYPT_ATTRIBUTES *)pvStructInfo; + const CRYPT_ATTRIBUTES *attributes = pvStructInfo; struct DERSetDescriptor desc = { attributes->cAttr, attributes->rgAttr, sizeof(CRYPT_ATTRIBUTE), 0, CRYPT_AsnEncodePKCSAttribute }; @@ -1872,7 +1860,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfoInternal( DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CRYPT_CONTENT_INFO *info = (const CRYPT_CONTENT_INFO *)pvStructInfo; + const CRYPT_CONTENT_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[2] = { { info->pszObjId, CRYPT_AsnEncodeOid, 0 }, { NULL, NULL, 0 }, @@ -1916,8 +1904,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfo(DWORD dwCertEncodingType, __TRY { - const CRYPT_CONTENT_INFO *info = - (const CRYPT_CONTENT_INFO *)pvStructInfo; + const CRYPT_CONTENT_INFO *info = pvStructInfo; if (!info->pszObjId) SetLastError(E_INVALIDARG); @@ -2170,7 +2157,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeNameValue(DWORD dwCertEncodingType, __TRY { - const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo; + const CERT_NAME_VALUE *value = pvStructInfo; switch (value->dwValueType) { @@ -2243,7 +2230,7 @@ static BOOL WINAPI CRYPT_AsnEncodeName(DWORD dwCertEncodingType, __TRY { - const CERT_NAME_INFO *info = (const CERT_NAME_INFO *)pvStructInfo; + const CERT_NAME_INFO *info = pvStructInfo; DWORD bytesNeeded = 0, lenBytes, size, i; TRACE("encoding name with %d RDNs\n", info->cRDN); @@ -2332,8 +2319,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAltNameEntry(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CERT_ALT_NAME_ENTRY *entry = - (const CERT_ALT_NAME_ENTRY *)pvStructInfo; + const CERT_ALT_NAME_ENTRY *entry = pvStructInfo; BOOL ret; DWORD dataLen; BYTE tag; @@ -2442,7 +2428,7 @@ static BOOL WINAPI CRYPT_AsnEncodeIntegerSwapBytes(DWORD dwCertEncodingType, __TRY { - const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvStructInfo; + const CRYPT_DATA_BLOB *blob = pvStructInfo; CRYPT_DATA_BLOB newBlob = { blob->cbData, NULL }; ret = TRUE; @@ -2481,8 +2467,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, __TRY { - const CERT_AUTHORITY_KEY_ID_INFO *info = - (const CERT_AUTHORITY_KEY_ID_INFO *)pvStructInfo; + const CERT_AUTHORITY_KEY_ID_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[3] = { { 0 } }; struct AsnEncodeTagSwappedItem swapped[3] = { { 0 } }; struct AsnConstructedItem constructed = { 0 }; @@ -2537,8 +2522,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAltName(DWORD dwCertEncodingType, __TRY { - const CERT_ALT_NAME_INFO *info = - (const CERT_ALT_NAME_INFO *)pvStructInfo; + const CERT_ALT_NAME_INFO *info = pvStructInfo; DWORD bytesNeeded, dataLen, lenBytes, i; ret = TRUE; @@ -2615,8 +2599,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, __TRY { - const CERT_AUTHORITY_KEY_ID2_INFO *info = - (const CERT_AUTHORITY_KEY_ID2_INFO *)pvStructInfo; + const CERT_AUTHORITY_KEY_ID2_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[3] = { { 0 } }; struct AsnEncodeTagSwappedItem swapped[3] = { { 0 } }; DWORD cItem = 0, cSwapped = 0; @@ -2689,8 +2672,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityInfoAccess(DWORD dwCertEncodingType, __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; - const CERT_AUTHORITY_INFO_ACCESS *info = - (const CERT_AUTHORITY_INFO_ACCESS *)pvStructInfo; + const CERT_AUTHORITY_INFO_ACCESS *info = pvStructInfo; ret = TRUE; for (i = 0, dataLen = 0; ret && i < info->cAccDescr; i++) @@ -2748,8 +2730,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints(DWORD dwCertEncodingType, __TRY { - const CERT_BASIC_CONSTRAINTS_INFO *info = - (const CERT_BASIC_CONSTRAINTS_INFO *)pvStructInfo; + const CERT_BASIC_CONSTRAINTS_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[3] = { { &info->SubjectType, CRYPT_AsnEncodeBits, 0 }, { 0 } @@ -2788,8 +2769,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints2(DWORD dwCertEncodingType, __TRY { - const CERT_BASIC_CONSTRAINTS2_INFO *info = - (const CERT_BASIC_CONSTRAINTS2_INFO *)pvStructInfo; + const CERT_BASIC_CONSTRAINTS2_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[2] = { { 0 } }; DWORD cItem = 0; @@ -2981,8 +2961,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, __TRY { - const BLOBHEADER *hdr = - (const BLOBHEADER *)pvStructInfo; + const BLOBHEADER *hdr = pvStructInfo; if (hdr->bType != PUBLICKEYBLOB) { @@ -3022,7 +3001,7 @@ BOOL WINAPI CRYPT_AsnEncodeOctets(DWORD dwCertEncodingType, __TRY { - const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvStructInfo; + const CRYPT_DATA_BLOB *blob = pvStructInfo; DWORD bytesNeeded, lenBytes; TRACE("(%d, %p), %08x, %p, %p, %d\n", blob->cbData, blob->pbData, @@ -3068,7 +3047,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBits(DWORD dwCertEncodingType, __TRY { - const CRYPT_BIT_BLOB *blob = (const CRYPT_BIT_BLOB *)pvStructInfo; + const CRYPT_BIT_BLOB *blob = pvStructInfo; DWORD bytesNeeded, lenBytes, dataBytes; BYTE unusedBits; @@ -3138,7 +3117,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBitsSwapBytes(DWORD dwCertEncodingType, __TRY { - const CRYPT_BIT_BLOB *blob = (const CRYPT_BIT_BLOB *)pvStructInfo; + const CRYPT_BIT_BLOB *blob = pvStructInfo; CRYPT_BIT_BLOB newBlob = { blob->cbData, NULL, blob->cUnusedBits }; ret = TRUE; @@ -3190,8 +3169,7 @@ static BOOL WINAPI CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, DWORD significantBytes, lenBytes, bytesNeeded; BYTE padByte = 0; BOOL pad = FALSE; - const CRYPT_INTEGER_BLOB *blob = - (const CRYPT_INTEGER_BLOB *)pvStructInfo; + const CRYPT_INTEGER_BLOB *blob = pvStructInfo; significantBytes = blob->cbData; if (significantBytes) @@ -3278,8 +3256,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnsignedInteger(DWORD dwCertEncodingType, { DWORD significantBytes, lenBytes, bytesNeeded; BOOL pad = FALSE; - const CRYPT_INTEGER_BLOB *blob = - (const CRYPT_INTEGER_BLOB *)pvStructInfo; + const CRYPT_INTEGER_BLOB *blob = pvStructInfo; significantBytes = blob->cbData; if (significantBytes) @@ -3382,8 +3359,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUtcTime(DWORD dwCertEncodingType, else { /* Sanity check the year, this is a two-digit year format */ - ret = FileTimeToSystemTime((const FILETIME *)pvStructInfo, - &sysTime); + ret = FileTimeToSystemTime(pvStructInfo, &sysTime); if (ret && (sysTime.wYear < 1950 || sysTime.wYear > 2050)) { SetLastError(CRYPT_E_BAD_ENCODE); @@ -3439,8 +3415,7 @@ static BOOL CRYPT_AsnEncodeGeneralizedTime(DWORD dwCertEncodingType, } else { - ret = FileTimeToSystemTime((const FILETIME *)pvStructInfo, - &sysTime); + ret = FileTimeToSystemTime(pvStructInfo, &sysTime); if (ret) ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, pcbEncoded, bytesNeeded); @@ -3477,7 +3452,7 @@ static BOOL WINAPI CRYPT_AsnEncodeChoiceOfTime(DWORD dwCertEncodingType, SYSTEMTIME sysTime; /* Check the year, if it's in the UTCTime range call that encode func */ - if (!FileTimeToSystemTime((const FILETIME *)pvStructInfo, &sysTime)) + if (!FileTimeToSystemTime(pvStructInfo, &sysTime)) return FALSE; if (sysTime.wYear >= 1950 && sysTime.wYear <= 2050) ret = CRYPT_AsnEncodeUtcTime(dwCertEncodingType, lpszStructType, @@ -3505,8 +3480,7 @@ static BOOL WINAPI CRYPT_AsnEncodeSequenceOfAny(DWORD dwCertEncodingType, __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; - const CRYPT_SEQUENCE_OF_ANY *seq = - (const CRYPT_SEQUENCE_OF_ANY *)pvStructInfo; + const CRYPT_SEQUENCE_OF_ANY *seq = pvStructInfo; for (i = 0, dataLen = 0; i < seq->cValue; i++) dataLen += seq->rgValue[i].cbData; @@ -3612,8 +3586,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLDistPoints(DWORD dwCertEncodingType, __TRY { - const CRL_DIST_POINTS_INFO *info = - (const CRL_DIST_POINTS_INFO *)pvStructInfo; + const CRL_DIST_POINTS_INFO *info = pvStructInfo; if (!info->cDistPoint) { @@ -3692,8 +3665,7 @@ static BOOL WINAPI CRYPT_AsnEncodeEnhancedKeyUsage(DWORD dwCertEncodingType, __TRY { - const CERT_ENHKEY_USAGE *usage = - (const CERT_ENHKEY_USAGE *)pvStructInfo; + const CERT_ENHKEY_USAGE *usage = pvStructInfo; DWORD bytesNeeded = 0, lenBytes, size, i; ret = TRUE; @@ -3756,8 +3728,7 @@ static BOOL WINAPI CRYPT_AsnEncodeIssuingDistPoint(DWORD dwCertEncodingType, __TRY { - const CRL_ISSUING_DIST_POINT *point = - (const CRL_ISSUING_DIST_POINT *)pvStructInfo; + const CRL_ISSUING_DIST_POINT *point = pvStructInfo; struct AsnEncodeSequenceItem items[6] = { { 0 } }; struct AsnConstructedItem constructed = { 0 }; struct AsnEncodeTagSwappedItem swapped[5] = { { 0 } }; @@ -3843,8 +3814,7 @@ static BOOL CRYPT_AsnEncodeGeneralSubtree(DWORD dwCertEncodingType, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret; - const CERT_GENERAL_SUBTREE *subtree = - (const CERT_GENERAL_SUBTREE *)pvStructInfo; + const CERT_GENERAL_SUBTREE *subtree = pvStructInfo; struct AsnEncodeSequenceItem items[3] = { { &subtree->Base, CRYPT_AsnEncodeAltNameEntry, 0 }, { 0 } @@ -3888,8 +3858,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameConstraints(DWORD dwCertEncodingType, __TRY { - const CERT_NAME_CONSTRAINTS_INFO *constraints = - (const CERT_NAME_CONSTRAINTS_INFO *)pvStructInfo; + const CERT_NAME_CONSTRAINTS_INFO *constraints = pvStructInfo; struct AsnEncodeSequenceItem items[2] = { { 0 } }; struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; DWORD i, cItem = 0, cSwapped = 0; @@ -3978,8 +3947,7 @@ static BOOL WINAPI CRYPT_AsnEncodeIssuerSerialNumber( DWORD *pcbEncoded) { BOOL ret; - const CERT_ISSUER_SERIAL_NUMBER *issuerSerial = - (const CERT_ISSUER_SERIAL_NUMBER *)pvStructInfo; + const CERT_ISSUER_SERIAL_NUMBER *issuerSerial = pvStructInfo; struct AsnEncodeSequenceItem items[] = { { &issuerSerial->Issuer, CRYPT_CopyEncodedBlob, 0 }, { &issuerSerial->SerialNumber, CRYPT_AsnEncodeInteger, 0 }, @@ -4005,7 +3973,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSSignerInfo(DWORD dwCertEncodingType, __TRY { - const CMSG_SIGNER_INFO *info = (const CMSG_SIGNER_INFO *)pvStructInfo; + const CMSG_SIGNER_INFO *info = pvStructInfo; if (!info->Issuer.cbData) SetLastError(E_INVALIDARG); @@ -4072,7 +4040,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCMSSignerInfo(DWORD dwCertEncodingType, __TRY { - const CMSG_CMS_SIGNER_INFO *info = (const CMSG_CMS_SIGNER_INFO *)pvStructInfo; + const CMSG_CMS_SIGNER_INFO *info = pvStructInfo; if (info->SignerId.dwIdChoice != CERT_ID_ISSUER_SERIAL_NUMBER && info->SignerId.dwIdChoice != CERT_ID_KEY_IDENTIFIER)