Skip to content

W
wine-cw
Commit 36886f7d authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

crypt32: Add/improve some traces.

parent a8b8ddd8
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 7 deletions
dlls/crypt32/cert.c
View file @ 36886f7d
...@@ -1091,7 +1091,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, ...@@ -1091,7 +1091,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,
PCCERT_CONTEXT ret; PCCERT_CONTEXT ret;
CertCompareFunc compare; CertCompareFunc compare;
TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType, TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType,
dwFlags, dwType, pvPara, pPrevCertContext); dwFlags, dwType, pvPara, pPrevCertContext);
switch (dwType >> CERT_COMPARE_SHIFT) switch (dwType >> CERT_COMPARE_SHIFT)
......
dlls/crypt32/encode.c
View file @ 36886f7d
...@@ -3626,9 +3626,9 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL ...@@ -3626,9 +3626,9 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL
HCRYPTKEY key; HCRYPTKEY key;
static CHAR oid[] = szOID_RSA_RSA; static CHAR oid[] = szOID_RSA_RSA;
TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
pvAuxInfo, pInfo, pcbInfo); pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
if (!pszPublicKeyObjId) if (!pszPublicKeyObjId)
pszPublicKeyObjId = oid; pszPublicKeyObjId = oid;
...@@ -3706,9 +3706,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro ...@@ -3706,9 +3706,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro
ExportPublicKeyInfoExFunc exportFunc = NULL; ExportPublicKeyInfoExFunc exportFunc = NULL;
HCRYPTOIDFUNCADDR hFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL;
TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
pvAuxInfo, pInfo, pcbInfo); pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
if (!hCryptProv) if (!hCryptProv)
{ {
...@@ -3747,7 +3747,7 @@ static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, ...@@ -3747,7 +3747,7 @@ static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv,
BOOL ret; BOOL ret;
DWORD pubKeySize = 0; DWORD pubKeySize = 0;
TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB,
...@@ -3785,7 +3785,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, ...@@ -3785,7 +3785,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv,
ImportPublicKeyInfoExFunc importFunc = NULL; ImportPublicKeyInfoExFunc importFunc = NULL;
HCRYPTOIDFUNCADDR hFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL;
TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
if (!set) if (!set)
......
dlls/crypt32/msg.c
View file @ 36886f7d
...@@ -1808,6 +1808,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, ...@@ -1808,6 +1808,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData,
DWORD size = sizeof(CMSG_SIGNER_INFO); DWORD size = sizeof(CMSG_SIGNER_INFO);
BOOL ret; BOOL ret;
TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
size += in->Issuer.cbData; size += in->Issuer.cbData;
size += in->SerialNumber.cbData; size += in->SerialNumber.cbData;
if (in->HashAlgorithm.pszObjId) if (in->HashAlgorithm.pszObjId)
...@@ -1853,6 +1855,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, ...@@ -1853,6 +1855,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData,
CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData);
ret = TRUE; ret = TRUE;
} }
TRACE("returning %d\n", ret);
return ret; return ret;
} }
...@@ -1862,6 +1865,8 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, ...@@ -1862,6 +1865,8 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData,
DWORD size = sizeof(CERT_INFO); DWORD size = sizeof(CERT_INFO);
BOOL ret; BOOL ret;
TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
size += in->Issuer.cbData; size += in->Issuer.cbData;
size += in->SerialNumber.cbData; size += in->SerialNumber.cbData;
if (!pvData) if (!pvData)
...@@ -1885,6 +1890,7 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, ...@@ -1885,6 +1890,7 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData,
CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData); CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData);
ret = TRUE; ret = TRUE;
} }
TRACE("returning %d\n", ret);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment