denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constraints: Add support for IP address nameConstraints

Browse Source
This commit is contained in:
Tobias Brunner
2023-11-13 12:23:33 +01:00
parent 1c3096fe50
commit 1589f2d9ae
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/constraints/constraints_validator.c
+25 -1
View File
@@ -143,6 +143,26 @@ static bool dn_matches(identification_t *constraint, identification_t *id)
return match;
}
/**
* Check if the given identity type matches the type of NameConstraint
*/
static bool type_matches(id_type_t constraint, id_type_t id)
{
switch (constraint)
{
case ID_FQDN:
case ID_RFC822_ADDR:
case ID_DER_ASN1_DN:
return constraint == id;
case ID_IPV4_ADDR_SUBNET:
return id == ID_IPV4_ADDR;
case ID_IPV6_ADDR_SUBNET:
return id == ID_IPV6_ADDR;
default:
return FALSE;
}
}
/**
* Check if a certificate matches to a NameConstraint
*/
@@ -168,7 +188,7 @@ static bool name_constraint_matches(identification_t *constraint,
enumerator = x509->create_subjectAltName_enumerator(x509);
while (enumerator->enumerate(enumerator, &id))
{
if (id->get_type(id) == type)
if (type_matches(type, id->get_type(id)))
{
switch (type)
{
@@ -181,6 +201,10 @@ static bool name_constraint_matches(identification_t *constraint,
case ID_DER_ASN1_DN:
matches = dn_matches(constraint, id);
break;
case ID_IPV4_ADDR_SUBNET:
case ID_IPV6_ADDR_SUBNET:
matches = id->matches(id, constraint);
break;
default:
DBG1(DBG_CFG, "%N NameConstraint matching not implemented",
id_type_names, type);