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

crypt32: Support IPv6 addresses in name constraint comparison.

Browse Source
This commit is contained in:
Juan Lang 2009-10-23 14:38:47 -07:00 committed by Alexandre Julliard
parent bcb4bc6be3
commit 24399bd359
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/crypt32/chain.c
View File

@ -548,9 +548,13 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint,
TRACE("(%d, %p), (%d, %p)\n", constraint->cbData, constraint->pbData, TRACE("(%d, %p), (%d, %p)\n", constraint->cbData, constraint->pbData,
name->cbData, name->pbData); name->cbData, name->pbData);
if (constraint->cbData != sizeof(DWORD) * 2) /* RFC5280, section 4.2.1.10, iPAddress syntax: either 8 or 32 bytes, for
* IPv4 or IPv6 addresses, respectively.
*/
if (constraint->cbData != sizeof(DWORD) * 2 && constraint->cbData != 32)
*trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS;
else if (name->cbData == sizeof(DWORD)) else if (name->cbData == sizeof(DWORD) &&
constraint->cbData == sizeof(DWORD) * 2)
{ {
DWORD subnet, mask, addr; DWORD subnet, mask, addr;
@ -562,6 +566,19 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint,
*/ */
match = (subnet & mask) == (addr & mask); match = (subnet & mask) == (addr & mask);
} }
else if (name->cbData == 16 && constraint->cbData == 32)
{
const BYTE *subnet, *mask, *addr;
DWORD i;
subnet = constraint->pbData;
mask = constraint->pbData + 16;
addr = name->pbData;
match = TRUE;
for (i = 0; match && i < 16; i++)
if ((subnet[i] & mask[i]) != (addr[i] & mask[i]))
match = FALSE;
}
/* else: name is wrong size, no match */ /* else: name is wrong size, no match */
return match; return match;