Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Well... I forgot to revert some files... sry

Browse source 
svn path=/trunk/; revision=33399
This commit is contained in:
Daniel Reimer 2008-05-09 17:45:46 +00:00
parent 65a136825d
commit 7a754a98d0
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/crypt32/context.c
View file

@ -71,7 +71,6 @@ void *Context_CreateDataContext(size_t contextSize)
ret = NULL; ret = NULL;
} }
} }
TRACE("returning %p\n", ret);
return ret; return ret;
} }
@ -97,7 +96,6 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned
InterlockedIncrement(&linkedBase->ref); InterlockedIncrement(&linkedBase->ref);
TRACE("%p's ref count is %d\n", context, linkContext->ref); TRACE("%p's ref count is %d\n", context, linkContext->ref);
} }
TRACE("returning %p\n", context);
return context; return context;
} }
@ -125,7 +123,7 @@ void *Context_GetLinkedContext(void *context, size_t contextSize)
contextSize); contextSize);
} }
PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize)
{ {
PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize);
@ -244,7 +242,7 @@ void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace)
list->contextInterface->free(toReplace); list->contextInterface->free(toReplace);
} }
else else
list_add_head(&list->contexts, entry); list_add_tail(&list->contexts, entry);
LeaveCriticalSection(&list->cs); LeaveCriticalSection(&list->cs);
} }
return context; return context;

39
reactos/dll/win32/crypt32/crl.c
View file

@ -266,10 +266,10 @@ DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext,
return ret; return ret;
} }
static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
DWORD dwFlags, const void *pvData); DWORD dwFlags, const void *pvData);
static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData,
DWORD *pcbData) DWORD *pcbData)
{ {
@ -284,9 +284,10 @@ static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId,
return ret; return ret;
} }
static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
void *pvData, DWORD *pcbData) void *pvData, DWORD *pcbData)
{ {
PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context;
PCONTEXT_PROPERTY_LIST properties = PCONTEXT_PROPERTY_LIST properties =
Context_GetProperties(context, sizeof(CRL_CONTEXT)); Context_GetProperties(context, sizeof(CRL_CONTEXT));
BOOL ret; BOOL ret;
@ -301,17 +302,20 @@ static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
if (ret) if (ret)
{ {
if (!pvData) if (!pvData)
{
*pcbData = blob.cbData; *pcbData = blob.cbData;
ret = TRUE;
}
else if (*pcbData < blob.cbData) else if (*pcbData < blob.cbData)
{ {
SetLastError(ERROR_MORE_DATA); SetLastError(ERROR_MORE_DATA);
*pcbData = blob.cbData; *pcbData = blob.cbData;
ret = FALSE;
} }
else else
{ {
memcpy(pvData, blob.pbData, blob.cbData); memcpy(pvData, blob.pbData, blob.cbData);
*pcbData = blob.cbData; *pcbData = blob.cbData;
ret = TRUE;
} }
} }
else else
@ -321,12 +325,12 @@ static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
{ {
case CERT_SHA1_HASH_PROP_ID: case CERT_SHA1_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1,
context->pbCrlEncoded, context->cbCrlEncoded, pvData, pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
pcbData); pcbData);
break; break;
case CERT_MD5_HASH_PROP_ID: case CERT_MD5_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5,
context->pbCrlEncoded, context->cbCrlEncoded, pvData, pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
pcbData); pcbData);
break; break;
default: default:
@ -367,22 +371,19 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
} }
else else
{ {
if (pCRLContext->hCertStore) *(DWORD *)pvData =
ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, CertStore_GetAccessState(pCRLContext->hCertStore);
pvData, pcbData);
else
*(DWORD *)pvData = 0;
ret = TRUE; ret = TRUE;
} }
break; break;
default: default:
ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData,
pcbData); pcbData);
} }
return ret; return ret;
} }
static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
DWORD dwFlags, const void *pvData) DWORD dwFlags, const void *pvData)
{ {
PCONTEXT_PROPERTY_LIST properties = PCONTEXT_PROPERTY_LIST properties =
@ -459,7 +460,8 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return FALSE; return FALSE;
} }
ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags,
pvData);
TRACE("returning %d\n", ret); TRACE("returning %d\n", ret);
return ret; return ret;
} }
@ -517,7 +519,10 @@ LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify,
if (!pTimeToVerify) if (!pTimeToVerify)
{ {
GetSystemTimeAsFileTime(&fileTime); SYSTEMTIME sysTime;
GetSystemTime(&sysTime);
SystemTimeToFileTime(&sysTime, &fileTime);
pTimeToVerify = &fileTime; pTimeToVerify = &fileTime;
} }
if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0) if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)