ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Implement quoting of simple string types.

This commit is contained in:
Juan Lang 2010-10-18 17:23:05 -07:00 committed by Alexandre Julliard
parent 462af2f91b
commit 993068038e
2 changed files with 76 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
dlls/crypt32/str.c
View File

@ -29,10 +29,29 @@
WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DEFAULT_DEBUG_CHANNEL(crypt);
static inline BOOL is_quotable_char(char c)
{
switch(c)
{
case '+':
case ',':
case '"':
case '=':
case '<':
case '>':
case ';':
case '#':
return TRUE;
default:
return FALSE;
}
}
DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
LPSTR psz, DWORD csz) LPSTR psz, DWORD csz)
{ {
DWORD ret = 0; DWORD ret = 0, len, i;
BOOL needsQuotes = FALSE;
TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
@ -48,18 +67,37 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_GRAPHIC_STRING:
case CERT_RDN_VISIBLE_STRING: case CERT_RDN_VISIBLE_STRING:
case CERT_RDN_GENERAL_STRING: case CERT_RDN_GENERAL_STRING:
len = pValue->cbData;
if (pValue->cbData && isspace(pValue->pbData[0]))
needsQuotes = TRUE;
if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1]))
needsQuotes = TRUE;
for (i = 0; i < pValue->cbData; i++)
{
if (is_quotable_char(pValue->pbData[i]))
needsQuotes = TRUE;
if (pValue->pbData[i] == '"')
len += 1;
}
if (needsQuotes)
len += 2;
if (!psz || !csz) if (!psz || !csz)
ret = pValue->cbData; ret = len;
else else
{ {
DWORD chars = min(pValue->cbData, csz - 1); char *ptr = psz;
if (chars) if (needsQuotes)
*ptr++ = '"';
for (i = 0; i < pValue->cbData && ptr - psz < csz; ptr++, i++)
{ {
memcpy(psz, pValue->pbData, chars); *ptr = pValue->pbData[i];
ret += chars; if (pValue->pbData[i] == '"' && ptr - psz < csz - 1)
csz -= chars; *(++ptr) = '"';
} }
if (needsQuotes && ptr - psz < csz)
*ptr++ = '"';
ret = ptr - psz;
} }
break; break;
case CERT_RDN_UTF8_STRING: case CERT_RDN_UTF8_STRING:
@ -91,7 +129,8 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
LPWSTR psz, DWORD csz) LPWSTR psz, DWORD csz)
{ {
DWORD ret = 0; DWORD ret = 0, len, i;
BOOL needsQuotes = FALSE;
TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz);
@ -107,21 +146,37 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_GRAPHIC_STRING:
case CERT_RDN_VISIBLE_STRING: case CERT_RDN_VISIBLE_STRING:
case CERT_RDN_GENERAL_STRING: case CERT_RDN_GENERAL_STRING:
len = pValue->cbData;
if (pValue->cbData && isspace(pValue->pbData[0]))
needsQuotes = TRUE;
if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1]))
needsQuotes = TRUE;
for (i = 0; i < pValue->cbData; i++)
{
if (is_quotable_char(pValue->pbData[i]))
needsQuotes = TRUE;
if (pValue->pbData[i] == '"')
len += 1;
}
if (needsQuotes)
len += 2;
if (!psz || !csz) if (!psz || !csz)
ret = pValue->cbData; ret = len;
else else
{ {
DWORD chars = min(pValue->cbData, csz - 1); WCHAR *ptr = psz;
if (chars) if (needsQuotes)
*ptr++ = '"';
for (i = 0; i < pValue->cbData && ptr - psz < csz; ptr++, i++)
{ {
DWORD i; *ptr = pValue->pbData[i];
if (pValue->pbData[i] == '"' && ptr - psz < csz - 1)
for (i = 0; i < chars; i++) *(++ptr) = '"';
psz[i] = pValue->pbData[i];
ret += chars;
csz -= chars;
} }
if (needsQuotes && ptr - psz < csz)
*ptr++ = '"';
ret = ptr - psz;
} }
break; break;
case CERT_RDN_UTF8_STRING: case CERT_RDN_UTF8_STRING:

8
dlls/crypt32/tests/str.c
View File

@ -439,20 +439,20 @@ static void test_CertNameToStrA(void)
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN='1'", FALSE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN='1'", FALSE);
blob.pbData = encodedSpacedCN; blob.pbData = encodedSpacedCN;
blob.cbData = sizeof(encodedSpacedCN); blob.cbData = sizeof(encodedSpacedCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\" 1 \"", TRUE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\" 1 \"", FALSE);
blob.pbData = encodedQuotedCN; blob.pbData = encodedQuotedCN;
blob.cbData = sizeof(encodedQuotedCN); blob.cbData = sizeof(encodedQuotedCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"\"\"1\"\"\"", test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"\"\"1\"\"\"",
TRUE); TRUE);
blob.pbData = encodedMultipleAttrCN; blob.pbData = encodedMultipleAttrCN;
blob.cbData = sizeof(encodedMultipleAttrCN); blob.cbData = sizeof(encodedMultipleAttrCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"1+2\"", TRUE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"1+2\"", FALSE);
blob.pbData = encodedCommaCN; blob.pbData = encodedCommaCN;
blob.cbData = sizeof(encodedCommaCN); blob.cbData = sizeof(encodedCommaCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a,b\"", TRUE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a,b\"", FALSE);
blob.pbData = encodedEqualCN; blob.pbData = encodedEqualCN;
blob.cbData = sizeof(encodedEqualCN); blob.cbData = sizeof(encodedEqualCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a=b\"", TRUE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a=b\"", FALSE);
blob.pbData = encodedLessThanCN; blob.pbData = encodedLessThanCN;
blob.cbData = sizeof(encodedLessThanCN); blob.cbData = sizeof(encodedLessThanCN);
test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"<\"", TRUE); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"<\"", TRUE);