aboutsummaryrefslogtreecommitdiffstats
path: root/src/pki
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2010-12-22 15:10:03 +0100
committerMartin Willi <martin@revosec.ch>2011-01-05 16:46:05 +0100
commitb3d359e58facb9744a1fc95507fb97e970b30891 (patch)
treeb03335fce01ee158aa5f993094ec076086f18c81 /src/pki
parentb1703d6cb3fb1df9df7f840d422de84ab3a0c3c7 (diff)
downloadstrongswan-b3d359e58facb9744a1fc95507fb97e970b30891.tar.bz2
strongswan-b3d359e58facb9744a1fc95507fb97e970b30891.tar.xz
Use a generic getter for all numerical X.509 constraints
Diffstat (limited to 'src/pki')
-rw-r--r--src/pki/commands/print.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pki/commands/print.c b/src/pki/commands/print.c
index 185895ec2..046f2bed0 100644
--- a/src/pki/commands/print.c
+++ b/src/pki/commands/print.c
@@ -73,7 +73,7 @@ static void print_x509(x509_t *x509)
chunk_t chunk;
bool first;
char *uri;
- int len;
+ int len, explicit, inhibit;
x509_flag_t flags;
x509_cdp_t *cdp;
x509_cert_policy_t *policy;
@@ -176,7 +176,7 @@ static void print_x509(x509_t *x509)
}
enumerator->destroy(enumerator);
- len = x509->get_pathLenConstraint(x509);
+ len = x509->get_constraint(x509, X509_PATH_LEN);
if (len != X509_NO_CONSTRAINT)
{
printf("pathlen: %d\n", len);
@@ -259,19 +259,19 @@ static void print_x509(x509_t *x509)
}
enumerator->destroy(enumerator);
- if (x509->get_policyConstraint(x509, FALSE) != X509_NO_CONSTRAINT ||
- x509->get_policyConstraint(x509, TRUE) != X509_NO_CONSTRAINT)
+ explicit = x509->get_constraint(x509, X509_REQUIRE_EXPLICIT_POLICY);
+ inhibit = x509->get_constraint(x509, X509_INHIBIT_POLICY_MAPPING);
+
+ if (explicit != X509_NO_CONSTRAINT || inhibit != X509_NO_CONSTRAINT)
{
printf("PolicyConstraints:\n");
- if (x509->get_policyConstraint(x509, FALSE) != X509_NO_CONSTRAINT)
+ if (explicit != X509_NO_CONSTRAINT)
{
- printf(" requireExplicitPolicy: %d\n",
- x509->get_policyConstraint(x509, FALSE));
+ printf(" requireExplicitPolicy: %d\n", explicit);
}
- if (x509->get_policyConstraint(x509, TRUE) != X509_NO_CONSTRAINT)
+ if (inhibit != X509_NO_CONSTRAINT)
{
- printf(" inhibitPolicyMapping: %d\n",
- x509->get_policyConstraint(x509, TRUE));
+ printf(" inhibitPolicyMapping: %d\n", inhibit);
}
}