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

streamlined output from get_validity()

Browse Source
This commit is contained in:
Andreas Steffen
2009-10-06 14:22:27 +02:00
parent afdaa9e5bf
commit cf85e1319b
12 changed files with 54 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/x509/x509_ac.c
+3 -23
View File
@@ -798,16 +798,8 @@ static private_x509_ac_t* get_ref(private_x509_ac_t *this)
static bool get_validity(private_x509_ac_t *this, time_t *when,
time_t *not_before, time_t *not_after)
{
time_t t;
time_t t = when ? *when : time(NULL);
if (when)
{
t = *when;
}
else
{
t = time(NULL);
}
if (not_before)
{
*not_before = this->notBefore;
@@ -816,19 +808,7 @@ static bool get_validity(private_x509_ac_t *this, time_t *when,
{
*not_after = this->notAfter;
}
if (t < this->notBefore)
{
DBG1("attribute certificate is not valid before %T",
this->notBefore, TRUE);
return FALSE;
}
if (t > this->notAfter)
{
DBG1("attribute certificate expired on %T",
this->notAfter, TRUE);
return FALSE;
}
return TRUE;
return (t >= this->notBefore && t <= this->notAfter);
}
/**
@@ -844,7 +824,7 @@ static bool is_newer(private_x509_ac_t *this, ac_t *that)
this_cert->get_validity(this_cert, &now, &this_update, NULL);
that_cert->get_validity(that_cert, &now, &that_update, NULL);
new = this_update > that_update;
DBG1(" attr cert from %T is %s - existing attr_cert from %T %s",
DBG1(" attr cert from %T is %s - existing attr cert from %T %s",
&this_update, FALSE, new ? "newer":"not newer",
&that_update, FALSE, new ? "replaced":"retained");
return new;
src/libstrongswan/plugins/x509/x509_crl.c
+1 -9
View File
@@ -458,16 +458,8 @@ static private_x509_crl_t* get_ref(private_x509_crl_t *this)
static bool get_validity(private_x509_crl_t *this, time_t *when,
time_t *not_before, time_t *not_after)
{
time_t t;
time_t t = when ? *when : time(NULL);
if (when)
{
t = *when;
}
else
{
t = time(NULL);
}
if (not_before)
{
*not_before = this->thisUpdate;
src/libstrongswan/plugins/x509/x509_ocsp_response.c
+1 -9
View File
@@ -748,16 +748,8 @@ static public_key_t* get_public_key(private_x509_ocsp_response_t *this)
static bool get_validity(private_x509_ocsp_response_t *this, time_t *when,
time_t *not_before, time_t *not_after)
{
time_t t;
time_t t = when ? *when : time(NULL);
if (when == NULL)
{
t = time(NULL);
}
else
{
t = *when;
}
if (not_before)
{
*not_before = this->producedAt;