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

Moved X509 pathlen constraint checking to constraints plugin

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:46:00 +01:00
parent 01d3038137
commit be8858e9b6
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/credential_manager.c
-17
View File
@@ -471,23 +471,6 @@ static bool check_certificate(private_credential_manager_t *this,
&not_before, FALSE, &not_after, FALSE); &not_before, FALSE, &not_after, FALSE);
return FALSE; return FALSE;
} }
if (issuer->get_type(issuer) == CERT_X509 &&
subject->get_type(subject) == CERT_X509)
{
int pathlen_constraint;
x509_t *x509;
/* check path length constraint */
x509 = (x509_t*)issuer;
pathlen_constraint = x509->get_pathLenConstraint(x509);
if (pathlen_constraint != X509_NO_PATH_LEN_CONSTRAINT &&
pathlen > pathlen_constraint)
{
DBG1(DBG_CFG, "path length of %d violates constraint of %d",
pathlen, pathlen_constraint);
return FALSE;
}
}
enumerator = this->validators->create_enumerator(this->validators); enumerator = this->validators->create_enumerator(this->validators);
while (enumerator->enumerate(enumerator, &validator)) while (enumerator->enumerate(enumerator, &validator))
src/libstrongswan/plugins/constraints/constraints_validator.c
+29
View File
@@ -15,6 +15,9 @@
#include "constraints_validator.h" #include "constraints_validator.h"
#include <debug.h>
#include <credentials/certificates/x509.h>
typedef struct private_constraints_validator_t private_constraints_validator_t; typedef struct private_constraints_validator_t private_constraints_validator_t;
/** /**
@@ -28,10 +31,36 @@ struct private_constraints_validator_t {
constraints_validator_t public; constraints_validator_t public;
}; };
/**
* Check pathlen constraint of issuer certificate
*/
static bool check_pathlen(x509_t *issuer, int pathlen)
{
int pathlen_constraint;
pathlen_constraint = issuer->get_pathLenConstraint(issuer);
if (pathlen_constraint != X509_NO_PATH_LEN_CONSTRAINT &&
pathlen > pathlen_constraint)
{
DBG1(DBG_CFG, "path length of %d violates constraint of %d",
pathlen, pathlen_constraint);
return FALSE;
}
return TRUE;
}
METHOD(cert_validator_t, validate, bool, METHOD(cert_validator_t, validate, bool,
private_constraints_validator_t *this, certificate_t *subject, private_constraints_validator_t *this, certificate_t *subject,
certificate_t *issuer, bool online, int pathlen, auth_cfg_t *auth) certificate_t *issuer, bool online, int pathlen, auth_cfg_t *auth)
{ {
if (issuer->get_type(issuer) == CERT_X509 &&
subject->get_type(subject) == CERT_X509)
{
if (!check_pathlen((x509_t*)issuer, pathlen))
{
return FALSE;
}
}
return TRUE; return TRUE;
} }