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

Slightly renamed X509_NO_PATH_LEN_CONSTRAINT to use it for PolicyConstraints, too

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:46:02 +01:00
parent 3ffc9d9a88
commit 5dba5852fc
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_list.c
+1 -1
View File
@@ -835,7 +835,7 @@ static void stroke_list_certs(linked_list_t *list, char *label,
/* list optional pathLenConstraint */ /* list optional pathLenConstraint */
pathlen = x509->get_pathLenConstraint(x509); pathlen = x509->get_pathLenConstraint(x509);
if (pathlen != X509_NO_PATH_LEN_CONSTRAINT) if (pathlen != X509_NO_CONSTRAINT)
{ {
fprintf(out, " pathlen: %d\n", pathlen); fprintf(out, " pathlen: %d\n", pathlen);
} }
src/libstrongswan/credentials/certificates/x509.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include <utils/enumerator.h> #include <utils/enumerator.h>
#include <credentials/certificates/certificate.h> #include <credentials/certificates/certificate.h>
#define X509_NO_PATH_LEN_CONSTRAINT -1 #define X509_NO_CONSTRAINT -1
typedef struct x509_t x509_t; typedef struct x509_t x509_t;
typedef struct x509_cert_policy_t x509_cert_policy_t; typedef struct x509_cert_policy_t x509_cert_policy_t;
src/libstrongswan/plugins/constraints/constraints_validator.c
+1 -1
View File
@@ -39,7 +39,7 @@ static bool check_pathlen(x509_t *issuer, int pathlen)
int pathlen_constraint; int pathlen_constraint;
pathlen_constraint = issuer->get_pathLenConstraint(issuer); pathlen_constraint = issuer->get_pathLenConstraint(issuer);
if (pathlen_constraint != X509_NO_PATH_LEN_CONSTRAINT && if (pathlen_constraint != X509_NO_CONSTRAINT &&
pathlen > pathlen_constraint) pathlen > pathlen_constraint)
{ {
DBG1(DBG_CFG, "path length of %d violates constraint of %d", DBG1(DBG_CFG, "path length of %d violates constraint of %d",
src/libstrongswan/plugins/openssl/openssl_x509.c
+1 -1
View File
@@ -581,7 +581,7 @@ static private_openssl_x509_t *create_empty()
.issuerAltNames = linked_list_create(), .issuerAltNames = linked_list_create(),
.crl_uris = linked_list_create(), .crl_uris = linked_list_create(),
.ocsp_uris = linked_list_create(), .ocsp_uris = linked_list_create(),
.pathlen = X509_NO_PATH_LEN_CONSTRAINT, .pathlen = X509_NO_CONSTRAINT,
.ref = 1, .ref = 1,
); );
src/libstrongswan/plugins/x509/x509_cert.c
+3 -3
View File
@@ -1800,7 +1800,7 @@ static private_x509_cert_t* create_empty(void)
.excluded_names = linked_list_create(), .excluded_names = linked_list_create(),
.cert_policies = linked_list_create(), .cert_policies = linked_list_create(),
.policy_mappings = linked_list_create(), .policy_mappings = linked_list_create(),
.pathLenConstraint = X509_NO_PATH_LEN_CONSTRAINT, .pathLenConstraint = X509_NO_CONSTRAINT,
.ref = 1, .ref = 1,
); );
return this; return this;
@@ -1997,7 +1997,7 @@ static bool generate(private_x509_cert_t *cert, certificate_t *sign_cert,
{ {
chunk_t pathLenConstraint = chunk_empty; chunk_t pathLenConstraint = chunk_empty;
if (cert->pathLenConstraint != X509_NO_PATH_LEN_CONSTRAINT) if (cert->pathLenConstraint != X509_NO_CONSTRAINT)
{ {
char pathlen = (char)cert->pathLenConstraint; char pathlen = (char)cert->pathLenConstraint;
@@ -2361,7 +2361,7 @@ x509_cert_t *x509_cert_gen(certificate_type_t type, va_list args)
cert->pathLenConstraint = va_arg(args, int); cert->pathLenConstraint = va_arg(args, int);
if (cert->pathLenConstraint < 0 || cert->pathLenConstraint > 127) if (cert->pathLenConstraint < 0 || cert->pathLenConstraint > 127)
{ {
cert->pathLenConstraint = X509_NO_PATH_LEN_CONSTRAINT; cert->pathLenConstraint = X509_NO_CONSTRAINT;
} }
continue; continue;
case BUILD_PERMITTED_NAME_CONSTRAINTS: case BUILD_PERMITTED_NAME_CONSTRAINTS:
src/pki/commands/issue.c
+1 -1
View File
@@ -59,7 +59,7 @@ static int issue()
identification_t *id = NULL, *crl_issuer = NULL;; identification_t *id = NULL, *crl_issuer = NULL;;
linked_list_t *san, *cdps, *ocsp, *permitted, *excluded, *policies, *mappings; linked_list_t *san, *cdps, *ocsp, *permitted, *excluded, *policies, *mappings;
int lifetime = 1095; int lifetime = 1095;
int pathlen = X509_NO_PATH_LEN_CONSTRAINT; int pathlen = X509_NO_CONSTRAINT;
chunk_t serial = chunk_empty; chunk_t serial = chunk_empty;
chunk_t encoding = chunk_empty; chunk_t encoding = chunk_empty;
time_t not_before, not_after; time_t not_before, not_after;
src/pki/commands/print.c
+1 -1
View File
@@ -176,7 +176,7 @@ static void print_x509(x509_t *x509)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
len = x509->get_pathLenConstraint(x509); len = x509->get_pathLenConstraint(x509);
if (len != X509_NO_PATH_LEN_CONSTRAINT) if (len != X509_NO_CONSTRAINT)
{ {
printf("pathlen: %d\n", len); printf("pathlen: %d\n", len);
} }
src/pki/commands/self.c
+1 -1
View File
@@ -56,7 +56,7 @@ static int self()
identification_t *id = NULL; identification_t *id = NULL;
linked_list_t *san, *ocsp, *permitted, *excluded, *policies, *mappings; linked_list_t *san, *ocsp, *permitted, *excluded, *policies, *mappings;
int lifetime = 1095; int lifetime = 1095;
int pathlen = X509_NO_PATH_LEN_CONSTRAINT; int pathlen = X509_NO_CONSTRAINT;
chunk_t serial = chunk_empty; chunk_t serial = chunk_empty;
chunk_t encoding = chunk_empty; chunk_t encoding = chunk_empty;
time_t not_before, not_after; time_t not_before, not_after;
src/pluto/ocsp.c
+1 -1
View File
@@ -1046,7 +1046,7 @@ static bool valid_ocsp_response(response_t *res)
/* check path length constraint */ /* check path length constraint */
pathlen_constraint = x509->get_pathLenConstraint(x509); pathlen_constraint = x509->get_pathLenConstraint(x509);
if (pathlen_constraint != X509_NO_PATH_LEN_CONSTRAINT && if (pathlen_constraint != X509_NO_CONSTRAINT &&
pathlen > pathlen_constraint) pathlen > pathlen_constraint)
{ {
plog("path length of %d violates constraint of %d", plog("path length of %d violates constraint of %d",
src/pluto/x509.c
+2 -2
View File
@@ -256,7 +256,7 @@ bool verify_x509cert(cert_t *cert, bool strict, time_t *until)
/* check path length constraint */ /* check path length constraint */
pathlen_constraint = x509->get_pathLenConstraint(x509); pathlen_constraint = x509->get_pathLenConstraint(x509);
if (pathlen_constraint != X509_NO_PATH_LEN_CONSTRAINT && if (pathlen_constraint != X509_NO_CONSTRAINT &&
pathlen > pathlen_constraint) pathlen > pathlen_constraint)
{ {
plog("path length of %d violates constraint of %d", plog("path length of %d violates constraint of %d",
@@ -451,7 +451,7 @@ void list_x509cert_chain(const char *caption, cert_t* cert,
/* list optional pathLenConstraint */ /* list optional pathLenConstraint */
pathlen = x509->get_pathLenConstraint(x509); pathlen = x509->get_pathLenConstraint(x509);
if (pathlen != X509_NO_PATH_LEN_CONSTRAINT) if (pathlen != X509_NO_CONSTRAINT)
{ {
whack_log(RC_COMMENT, " pathlen: %d", pathlen); whack_log(RC_COMMENT, " pathlen: %d", pathlen);
} }