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

Slightly renamed different policyConstraints to distinguish them better

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:46:05 +01:00
parent 6a339fffc7
commit b088fd4a76
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/builder.c
+3 -3
View File
@@ -47,9 +47,9 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END,
"BUILD_EXCLUDED_NAME_CONSTRAINTS", "BUILD_EXCLUDED_NAME_CONSTRAINTS",
"BUILD_CERTIFICATE_POLICIES", "BUILD_CERTIFICATE_POLICIES",
"BUILD_POLICY_MAPPINGS", "BUILD_POLICY_MAPPINGS",
"BUILD_POLICY_CONSTRAINT_EXPLICIT", "BUILD_POLICY_REQUIRE_EXPLICIT",
"BUILD_POLICY_CONSTRAINT_INHIBIT", "BUILD_POLICY_INHIBIT_MAPPING",
"BUILD_POLICY_CONSTRAINT_INHIBIT_ANY", "BUILD_POLICY_INHIBIT_ANY",
"BUILD_X509_FLAG", "BUILD_X509_FLAG",
"BUILD_REVOKED_ENUMERATOR", "BUILD_REVOKED_ENUMERATOR",
"BUILD_BASE_CRL", "BUILD_BASE_CRL",
src/libstrongswan/credentials/builder.h
+3 -3
View File
@@ -102,11 +102,11 @@ enum builder_part_t {
/** policyMapping OIDs, linked_list_t* of x509_policy_mapping_t* */ /** policyMapping OIDs, linked_list_t* of x509_policy_mapping_t* */
BUILD_POLICY_MAPPINGS, BUILD_POLICY_MAPPINGS,
/** requireExplicitPolicy constraint, int */ /** requireExplicitPolicy constraint, int */
BUILD_POLICY_CONSTRAINT_EXPLICIT, BUILD_POLICY_REQUIRE_EXPLICIT,
/** inhibitPolicyMapping constraint, int */ /** inhibitPolicyMapping constraint, int */
BUILD_POLICY_CONSTRAINT_INHIBIT, BUILD_POLICY_INHIBIT_MAPPING,
/** inhibitAnyPolicy constraint, int */ /** inhibitAnyPolicy constraint, int */
BUILD_POLICY_CONSTRAINT_INHIBIT_ANY, BUILD_POLICY_INHIBIT_ANY,
/** enforce an additional X509 flag, x509_flag_t */ /** enforce an additional X509 flag, x509_flag_t */
BUILD_X509_FLAG, BUILD_X509_FLAG,
/** enumerator_t over (chunk_t serial, time_t date, crl_reason_t reason) */ /** enumerator_t over (chunk_t serial, time_t date, crl_reason_t reason) */
src/libstrongswan/plugins/x509/x509_cert.c
+26 -26
View File
@@ -179,17 +179,17 @@ struct private_x509_cert_t {
/** /**
* requireExplicitPolicy Constraint * requireExplicitPolicy Constraint
*/ */
char explicit_policy_constraint; char require_explicit;
/** /**
* inhibitPolicyMapping Constraint * inhibitPolicyMapping Constraint
*/ */
char inhibit_policy_constraint; char inhibit_mapping;
/** /**
* inhibitAnyPolicy Constraint * inhibitAnyPolicy Constraint
*/ */
char inhibit_any_policy; char inhibit_any;
/** /**
* x509 constraints and other flags * x509 constraints and other flags
@@ -1089,10 +1089,10 @@ static void parse_policyConstraints(chunk_t blob, int level0,
switch (objectID) switch (objectID)
{ {
case POLICY_CONSTRAINT_EXPLICIT: case POLICY_CONSTRAINT_EXPLICIT:
this->explicit_policy_constraint = parse_constraint(object); this->require_explicit = parse_constraint(object);
break; break;
case POLICY_CONSTRAINT_INHIBIT: case POLICY_CONSTRAINT_INHIBIT:
this->inhibit_policy_constraint = parse_constraint(object); this->inhibit_mapping = parse_constraint(object);
break; break;
default: default:
break; break;
@@ -1429,7 +1429,7 @@ static bool parse_certificate(private_x509_cert_t *this)
{ {
goto end; goto end;
} }
this->inhibit_any_policy = parse_constraint(object); this->inhibit_any = parse_constraint(object);
break; break;
case OID_NS_REVOCATION_URL: case OID_NS_REVOCATION_URL:
case OID_NS_CA_REVOCATION_URL: case OID_NS_CA_REVOCATION_URL:
@@ -1731,11 +1731,11 @@ METHOD(x509_t, get_constraint, int,
case X509_PATH_LEN: case X509_PATH_LEN:
return this->pathLenConstraint; return this->pathLenConstraint;
case X509_REQUIRE_EXPLICIT_POLICY: case X509_REQUIRE_EXPLICIT_POLICY:
return this->explicit_policy_constraint; return this->require_explicit;
case X509_INHIBIT_POLICY_MAPPING: case X509_INHIBIT_POLICY_MAPPING:
return this->inhibit_policy_constraint; return this->inhibit_mapping;
case X509_INHIBIT_ANY_POLICY: case X509_INHIBIT_ANY_POLICY:
return this->inhibit_any_policy; return this->inhibit_any;
default: default:
return X509_NO_CONSTRAINT; return X509_NO_CONSTRAINT;
} }
@@ -1870,9 +1870,9 @@ static private_x509_cert_t* create_empty(void)
.cert_policies = linked_list_create(), .cert_policies = linked_list_create(),
.policy_mappings = linked_list_create(), .policy_mappings = linked_list_create(),
.pathLenConstraint = X509_NO_CONSTRAINT, .pathLenConstraint = X509_NO_CONSTRAINT,
.explicit_policy_constraint = X509_NO_CONSTRAINT, .require_explicit = X509_NO_CONSTRAINT,
.inhibit_policy_constraint = X509_NO_CONSTRAINT, .inhibit_mapping = X509_NO_CONSTRAINT,
.inhibit_any_policy = X509_NO_CONSTRAINT, .inhibit_any = X509_NO_CONSTRAINT,
.ref = 1, .ref = 1,
); );
return this; return this;
@@ -2263,22 +2263,22 @@ static bool generate(private_x509_cert_t *cert, certificate_t *sign_cert,
asn1_wrap(ASN1_SEQUENCE, "m", policyMappings))); asn1_wrap(ASN1_SEQUENCE, "m", policyMappings)));
} }
if (cert->inhibit_policy_constraint != X509_NO_CONSTRAINT || if (cert->inhibit_mapping != X509_NO_CONSTRAINT ||
cert->explicit_policy_constraint != X509_NO_CONSTRAINT) cert->require_explicit != X509_NO_CONSTRAINT)
{ {
chunk_t inhibit = chunk_empty, explicit = chunk_empty; chunk_t inhibit = chunk_empty, explicit = chunk_empty;
if (cert->explicit_policy_constraint != X509_NO_CONSTRAINT) if (cert->require_explicit != X509_NO_CONSTRAINT)
{ {
explicit = asn1_wrap(ASN1_CONTEXT_C_0, "m", explicit = asn1_wrap(ASN1_CONTEXT_C_0, "m",
asn1_integer("c", asn1_integer("c",
chunk_from_thing(cert->explicit_policy_constraint))); chunk_from_thing(cert->require_explicit)));
} }
if (cert->inhibit_policy_constraint != X509_NO_CONSTRAINT) if (cert->inhibit_mapping != X509_NO_CONSTRAINT)
{ {
inhibit = asn1_wrap(ASN1_CONTEXT_C_1, "m", inhibit = asn1_wrap(ASN1_CONTEXT_C_1, "m",
asn1_integer("c", asn1_integer("c",
chunk_from_thing(cert->inhibit_policy_constraint))); chunk_from_thing(cert->inhibit_mapping)));
} }
policyConstraints = asn1_wrap(ASN1_SEQUENCE, "mmm", policyConstraints = asn1_wrap(ASN1_SEQUENCE, "mmm",
asn1_build_known_oid(OID_POLICY_CONSTRAINTS), asn1_build_known_oid(OID_POLICY_CONSTRAINTS),
@@ -2288,14 +2288,14 @@ static bool generate(private_x509_cert_t *cert, certificate_t *sign_cert,
explicit, inhibit))); explicit, inhibit)));
} }
if (cert->inhibit_any_policy != X509_NO_CONSTRAINT) if (cert->inhibit_any != X509_NO_CONSTRAINT)
{ {
inhibitAnyPolicy = asn1_wrap(ASN1_SEQUENCE, "mmm", inhibitAnyPolicy = asn1_wrap(ASN1_SEQUENCE, "mmm",
asn1_build_known_oid(OID_INHIBIT_ANY_POLICY), asn1_build_known_oid(OID_INHIBIT_ANY_POLICY),
asn1_wrap(ASN1_BOOLEAN, "c", chunk_from_chars(0xFF)), asn1_wrap(ASN1_BOOLEAN, "c", chunk_from_chars(0xFF)),
asn1_wrap(ASN1_OCTET_STRING, "m", asn1_wrap(ASN1_OCTET_STRING, "m",
asn1_integer("c", asn1_integer("c",
chunk_from_thing(cert->inhibit_any_policy)))); chunk_from_thing(cert->inhibit_any))));
} }
if (basicConstraints.ptr || subjectAltNames.ptr || authKeyIdentifier.ptr || if (basicConstraints.ptr || subjectAltNames.ptr || authKeyIdentifier.ptr ||
@@ -2542,14 +2542,14 @@ x509_cert_t *x509_cert_gen(certificate_type_t type, va_list args)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
continue; continue;
} }
case BUILD_POLICY_CONSTRAINT_EXPLICIT: case BUILD_POLICY_REQUIRE_EXPLICIT:
cert->explicit_policy_constraint = va_arg(args, int); cert->require_explicit = va_arg(args, int);
continue; continue;
case BUILD_POLICY_CONSTRAINT_INHIBIT: case BUILD_POLICY_INHIBIT_MAPPING:
cert->inhibit_policy_constraint = va_arg(args, int); cert->inhibit_mapping = va_arg(args, int);
continue; continue;
case BUILD_POLICY_CONSTRAINT_INHIBIT_ANY: case BUILD_POLICY_INHIBIT_ANY:
cert->inhibit_any_policy = va_arg(args, int); cert->inhibit_any = va_arg(args, int);
continue; continue;
case BUILD_NOT_BEFORE_TIME: case BUILD_NOT_BEFORE_TIME:
cert->notBefore = va_arg(args, time_t); cert->notBefore = va_arg(args, time_t);
src/pki/commands/issue.c
+6 -6
View File
@@ -69,7 +69,7 @@ static int issue()
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_CONSTRAINT, inhibit_any = X509_NO_CONSTRAINT; int pathlen = X509_NO_CONSTRAINT, inhibit_any = X509_NO_CONSTRAINT;
int inhibit_policy = X509_NO_CONSTRAINT, explicit_policy = X509_NO_CONSTRAINT; int inhibit_mapping = X509_NO_CONSTRAINT, require_explicit = 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;
@@ -212,10 +212,10 @@ static int issue()
continue; continue;
} }
case 'E': case 'E':
explicit_policy = atoi(arg); require_explicit = atoi(arg);
continue; continue;
case 'H': case 'H':
inhibit_policy = atoi(arg); inhibit_mapping = atoi(arg);
continue; continue;
case 'A': case 'A':
inhibit_any = atoi(arg); inhibit_any = atoi(arg);
@@ -447,9 +447,9 @@ static int issue()
BUILD_EXCLUDED_NAME_CONSTRAINTS, excluded, BUILD_EXCLUDED_NAME_CONSTRAINTS, excluded,
BUILD_CERTIFICATE_POLICIES, policies, BUILD_CERTIFICATE_POLICIES, policies,
BUILD_POLICY_MAPPINGS, mappings, BUILD_POLICY_MAPPINGS, mappings,
BUILD_POLICY_CONSTRAINT_INHIBIT, inhibit_policy, BUILD_POLICY_REQUIRE_EXPLICIT, require_explicit,
BUILD_POLICY_CONSTRAINT_EXPLICIT, explicit_policy, BUILD_POLICY_INHIBIT_MAPPING, inhibit_mapping,
BUILD_POLICY_CONSTRAINT_INHIBIT_ANY, inhibit_any, BUILD_POLICY_INHIBIT_ANY, inhibit_any,
BUILD_END); BUILD_END);
if (!cert) if (!cert)
{ {
src/pki/commands/self.c
+6 -6
View File
@@ -57,7 +57,7 @@ static int self()
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_CONSTRAINT, inhibit_any = X509_NO_CONSTRAINT; int pathlen = X509_NO_CONSTRAINT, inhibit_any = X509_NO_CONSTRAINT;
int inhibit_policy = X509_NO_CONSTRAINT, explicit_policy = X509_NO_CONSTRAINT; int inhibit_mapping = X509_NO_CONSTRAINT, require_explicit = 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;
@@ -195,10 +195,10 @@ static int self()
continue; continue;
} }
case 'E': case 'E':
explicit_policy = atoi(arg); require_explicit = atoi(arg);
continue; continue;
case 'H': case 'H':
inhibit_policy = atoi(arg); inhibit_mapping = atoi(arg);
continue; continue;
case 'A': case 'A':
inhibit_any = atoi(arg); inhibit_any = atoi(arg);
@@ -315,9 +315,9 @@ static int self()
BUILD_EXCLUDED_NAME_CONSTRAINTS, excluded, BUILD_EXCLUDED_NAME_CONSTRAINTS, excluded,
BUILD_CERTIFICATE_POLICIES, policies, BUILD_CERTIFICATE_POLICIES, policies,
BUILD_POLICY_MAPPINGS, mappings, BUILD_POLICY_MAPPINGS, mappings,
BUILD_POLICY_CONSTRAINT_EXPLICIT, explicit_policy, BUILD_POLICY_REQUIRE_EXPLICIT, require_explicit,
BUILD_POLICY_CONSTRAINT_INHIBIT, inhibit_policy, BUILD_POLICY_INHIBIT_MAPPING, inhibit_mapping,
BUILD_POLICY_CONSTRAINT_INHIBIT_ANY, inhibit_any, BUILD_POLICY_INHIBIT_ANY, inhibit_any,
BUILD_END); BUILD_END);
if (!cert) if (!cert)
{ {