Juan Lang : crypt32:
Use CRYPT_EncodeEnsureSpace to allocate memory when necessary.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jun 13 06:14:05 CDT 2007
Module: wine
Branch: master
Commit: 74addd636e6bd64501b01bd3b188171976e47028
URL: http://source.winehq.org/git/wine.git/?a=commit;h=74addd636e6bd64501b01bd3b188171976e47028
Author: Juan Lang <juan_lang at yahoo.com>
Date: Tue Jun 12 15:01:04 2007 -0700
crypt32: Use CRYPT_EncodeEnsureSpace to allocate memory when necessary.
---
dlls/crypt32/encode.c | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index 9cf70b8..6b78686 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -1176,42 +1176,34 @@ static BOOL WINAPI CRYPT_DEREncodeSet(DWORD dwCertEncodingType,
LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
{
- CRYPT_SET_OF *set = (CRYPT_SET_OF *)pvStructInfo;
+ const CRYPT_SET_OF *set = (const CRYPT_SET_OF *)pvStructInfo;
DWORD bytesNeeded = 0, lenBytes, i;
- BOOL ret = FALSE;
+ BOOL ret;
for (i = 0; i < set->cValue; i++)
bytesNeeded += set->rgValue[i].cbData;
CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes);
bytesNeeded += 1 + lenBytes;
- if (pbEncoded)
- {
- if (*pcbEncoded < bytesNeeded)
- {
- *pcbEncoded = bytesNeeded;
- SetLastError(ERROR_MORE_DATA);
- }
- else
- {
- ret = TRUE;
- *pcbEncoded = bytesNeeded;
- qsort(set->rgValue, set->cValue, sizeof(CRYPT_DER_BLOB), BLOBComp);
- *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF;
- CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes);
- pbEncoded += lenBytes;
- for (i = 0; ret && i < set->cValue; i++)
- {
- memcpy(pbEncoded, set->rgValue[i].pbData,
- set->rgValue[i].cbData);
- pbEncoded += set->rgValue[i].cbData;
- }
- }
- }
- else
+ if (!pbEncoded)
{
*pcbEncoded = bytesNeeded;
ret = TRUE;
}
+ else if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara,
+ pbEncoded, pcbEncoded, bytesNeeded)))
+ {
+ if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)
+ pbEncoded = *(BYTE **)pbEncoded;
+ qsort(set->rgValue, set->cValue, sizeof(CRYPT_DER_BLOB), BLOBComp);
+ *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF;
+ CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes);
+ pbEncoded += lenBytes;
+ for (i = 0; ret && i < set->cValue; i++)
+ {
+ memcpy(pbEncoded, set->rgValue[i].pbData, set->rgValue[i].cbData);
+ pbEncoded += set->rgValue[i].cbData;
+ }
+ }
return ret;
}
More information about the wine-cvs
mailing list