mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 08:54:40 +00:00
[crypt32]
sync crypt32 to wine 1.1.42 svn path=/trunk/; revision=46727
This commit is contained in:
parent
dfb82f3856
commit
215581f39f
|
@ -99,8 +99,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
|
||||||
|
|
||||||
TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes);
|
TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes);
|
||||||
needed = bytes + pad_bytes + 1;
|
needed = bytes + pad_bytes + 1;
|
||||||
if (sep)
|
needed += (needed / 64 + 1) * strlen(sep);
|
||||||
needed += (needed / 64 + 1) * strlen(sep);
|
|
||||||
|
|
||||||
if (needed > *out_len)
|
if (needed > *out_len)
|
||||||
{
|
{
|
||||||
|
@ -117,7 +116,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
|
||||||
i = 0;
|
i = 0;
|
||||||
while (div > 0)
|
while (div > 0)
|
||||||
{
|
{
|
||||||
if (sep && i && i % 64 == 0)
|
if (i && i % 64 == 0)
|
||||||
{
|
{
|
||||||
strcpy(ptr, sep);
|
strcpy(ptr, sep);
|
||||||
ptr += strlen(sep);
|
ptr += strlen(sep);
|
||||||
|
@ -163,8 +162,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
|
||||||
*ptr++ = '=';
|
*ptr++ = '=';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (sep)
|
strcpy(ptr, sep);
|
||||||
strcpy(ptr, sep);
|
|
||||||
|
|
||||||
return ERROR_SUCCESS;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -180,7 +178,7 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary,
|
||||||
if (dwFlags & CRYPT_STRING_NOCR)
|
if (dwFlags & CRYPT_STRING_NOCR)
|
||||||
sep = lf;
|
sep = lf;
|
||||||
else if (dwFlags & CRYPT_STRING_NOCRLF)
|
else if (dwFlags & CRYPT_STRING_NOCRLF)
|
||||||
sep = NULL;
|
sep = "";
|
||||||
else
|
else
|
||||||
sep = crlf;
|
sep = crlf;
|
||||||
switch (dwFlags & 0x0fffffff)
|
switch (dwFlags & 0x0fffffff)
|
||||||
|
@ -204,8 +202,6 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary,
|
||||||
|
|
||||||
charsNeeded = 0;
|
charsNeeded = 0;
|
||||||
encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded);
|
encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded);
|
||||||
if (sep)
|
|
||||||
charsNeeded += strlen(sep);
|
|
||||||
if (header)
|
if (header)
|
||||||
charsNeeded += strlen(header) + strlen(sep);
|
charsNeeded += strlen(header) + strlen(sep);
|
||||||
if (trailer)
|
if (trailer)
|
||||||
|
@ -219,11 +215,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary,
|
||||||
{
|
{
|
||||||
strcpy(ptr, header);
|
strcpy(ptr, header);
|
||||||
ptr += strlen(ptr);
|
ptr += strlen(ptr);
|
||||||
if (sep)
|
strcpy(ptr, sep);
|
||||||
{
|
ptr += strlen(sep);
|
||||||
strcpy(ptr, sep);
|
|
||||||
ptr += strlen(sep);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
encodeBase64A(pbBinary, cbBinary, sep, ptr, &size);
|
encodeBase64A(pbBinary, cbBinary, sep, ptr, &size);
|
||||||
ptr += size - 1;
|
ptr += size - 1;
|
||||||
|
@ -231,11 +224,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary,
|
||||||
{
|
{
|
||||||
strcpy(ptr, trailer);
|
strcpy(ptr, trailer);
|
||||||
ptr += strlen(ptr);
|
ptr += strlen(ptr);
|
||||||
if (sep)
|
strcpy(ptr, sep);
|
||||||
{
|
ptr += strlen(sep);
|
||||||
strcpy(ptr, sep);
|
|
||||||
ptr += strlen(sep);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
*pcchString = charsNeeded - 1;
|
*pcchString = charsNeeded - 1;
|
||||||
}
|
}
|
||||||
|
@ -304,8 +294,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
|
||||||
|
|
||||||
TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes);
|
TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes);
|
||||||
needed = bytes + pad_bytes + 1;
|
needed = bytes + pad_bytes + 1;
|
||||||
if (sep)
|
needed += (needed / 64 + 1) * strlenW(sep);
|
||||||
needed += (needed / 64 + 1) * strlenW(sep);
|
|
||||||
|
|
||||||
if (needed > *out_len)
|
if (needed > *out_len)
|
||||||
{
|
{
|
||||||
|
@ -322,7 +311,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
|
||||||
i = 0;
|
i = 0;
|
||||||
while (div > 0)
|
while (div > 0)
|
||||||
{
|
{
|
||||||
if (sep && i && i % 64 == 0)
|
if (i && i % 64 == 0)
|
||||||
{
|
{
|
||||||
strcpyW(ptr, sep);
|
strcpyW(ptr, sep);
|
||||||
ptr += strlenW(sep);
|
ptr += strlenW(sep);
|
||||||
|
@ -368,8 +357,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
|
||||||
*ptr++ = '=';
|
*ptr++ = '=';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (sep)
|
strcpyW(ptr, sep);
|
||||||
strcpyW(ptr, sep);
|
|
||||||
|
|
||||||
return ERROR_SUCCESS;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -377,7 +365,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
|
||||||
static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
||||||
DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString)
|
DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString)
|
||||||
{
|
{
|
||||||
static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 };
|
static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }, empty[] = {0};
|
||||||
BOOL ret = TRUE;
|
BOOL ret = TRUE;
|
||||||
LPCWSTR header = NULL, trailer = NULL, sep;
|
LPCWSTR header = NULL, trailer = NULL, sep;
|
||||||
DWORD charsNeeded;
|
DWORD charsNeeded;
|
||||||
|
@ -385,7 +373,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
||||||
if (dwFlags & CRYPT_STRING_NOCR)
|
if (dwFlags & CRYPT_STRING_NOCR)
|
||||||
sep = lf;
|
sep = lf;
|
||||||
else if (dwFlags & CRYPT_STRING_NOCRLF)
|
else if (dwFlags & CRYPT_STRING_NOCRLF)
|
||||||
sep = NULL;
|
sep = empty;
|
||||||
else
|
else
|
||||||
sep = crlf;
|
sep = crlf;
|
||||||
switch (dwFlags & 0x0fffffff)
|
switch (dwFlags & 0x0fffffff)
|
||||||
|
@ -409,8 +397,6 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
||||||
|
|
||||||
charsNeeded = 0;
|
charsNeeded = 0;
|
||||||
encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded);
|
encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded);
|
||||||
if (sep)
|
|
||||||
charsNeeded += strlenW(sep);
|
|
||||||
if (header)
|
if (header)
|
||||||
charsNeeded += strlenW(header) + strlenW(sep);
|
charsNeeded += strlenW(header) + strlenW(sep);
|
||||||
if (trailer)
|
if (trailer)
|
||||||
|
@ -424,11 +410,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
||||||
{
|
{
|
||||||
strcpyW(ptr, header);
|
strcpyW(ptr, header);
|
||||||
ptr += strlenW(ptr);
|
ptr += strlenW(ptr);
|
||||||
if (sep)
|
strcpyW(ptr, sep);
|
||||||
{
|
ptr += strlenW(sep);
|
||||||
strcpyW(ptr, sep);
|
|
||||||
ptr += strlenW(sep);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
encodeBase64W(pbBinary, cbBinary, sep, ptr, &size);
|
encodeBase64W(pbBinary, cbBinary, sep, ptr, &size);
|
||||||
ptr += size - 1;
|
ptr += size - 1;
|
||||||
|
@ -436,11 +419,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary,
|
||||||
{
|
{
|
||||||
strcpyW(ptr, trailer);
|
strcpyW(ptr, trailer);
|
||||||
ptr += strlenW(ptr);
|
ptr += strlenW(ptr);
|
||||||
if (sep)
|
strcpyW(ptr, sep);
|
||||||
{
|
ptr += strlenW(sep);
|
||||||
strcpyW(ptr, sep);
|
|
||||||
ptr += strlenW(sep);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
*pcchString = charsNeeded - 1;
|
*pcchString = charsNeeded - 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue