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

removed my time_t printf handler patch, applied the one of andreas (64bit save)

Browse Source
This commit is contained in:
Martin Willi
2007-02-08 15:22:21 +00:00
parent 61c0e0f220
commit 7006a51efc
5 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/crl.c
+8 -8
View File
@@ -315,9 +315,9 @@ static err_t is_valid(const private_crl_t *this, time_t *until, bool strict)
{
time_t current_time = time(NULL);
DBG2(" this update : %T", this->thisUpdate);
DBG2(" current time: %T", current_time);
DBG2(" next update: %T", this->nextUpdate);
DBG2(" this update : %T", &this->thisUpdate);
DBG2(" current time: %T", &current_time);
DBG2(" next update: %T", &this->nextUpdate);
if (strict && until != NULL &&
(*until == UNDEFINED_TIME || this->nextUpdate < *until))
@@ -440,22 +440,22 @@ static int print(FILE *stream, const struct printf_info *info,
now = time(NULL);
written += fprintf(stream, "%#T, revoked certs: %d\n", this->installed, utc,
written += fprintf(stream, "%#T, revoked certs: %d\n", &this->installed, utc,
this->revokedCertificates->get_count(this->revokedCertificates));
written += fprintf(stream, " issuer: '%D'\n", this->issuer);
written += fprintf(stream, " updates: this %#T\n", this->thisUpdate, utc);
written += fprintf(stream, " next %#T ", this->nextUpdate, utc);
written += fprintf(stream, " updates: this %#T\n", &this->thisUpdate, utc);
written += fprintf(stream, " next %#T ", &this->nextUpdate, utc);
if (this->nextUpdate == UNDEFINED_TIME)
{
written += fprintf(stream, "ok (expires never)");
}
else if (now > this->nextUpdate)
{
written += fprintf(stream, "expired (since %V)", now, this->nextUpdate);
written += fprintf(stream, "expired (since %V)", &now, &this->nextUpdate);
}
else if (now > this->nextUpdate - CRL_WARNING_INTERVAL * 60 * 60 * 24)
{
written += fprintf(stream, "ok (expires in %V)", now, this->nextUpdate);
written += fprintf(stream, "ok (expires in %V)", &now, &this->nextUpdate);
}
else
{
src/libstrongswan/crypto/x509.c
+11 -11
View File
@@ -886,9 +886,9 @@ static err_t is_valid(const private_x509_t *this, time_t *until)
{
time_t current_time = time(NULL);
DBG2(" not before : %T", this->notBefore);
DBG2(" current time: %T", current_time);
DBG2(" not after : %T", this->notAfter);
DBG2(" not before : %T", &this->notBefore);
DBG2(" current time: %T", &current_time);
DBG2(" not after : %T", &this->notAfter);
if (until != NULL &&
(*until == UNDEFINED_TIME || this->notAfter < *until))
@@ -1068,7 +1068,7 @@ static int print(FILE *stream, const struct printf_info *info,
/* determine the current time */
time_t now = time(NULL);
written += fprintf(stream, "%#T\n", this->installed, utc);
written += fprintf(stream, "%#T\n", &this->installed, utc);
if (this->subjectAltNames->get_count(this->subjectAltNames))
{
@@ -1095,20 +1095,20 @@ static int print(FILE *stream, const struct printf_info *info,
written += fprintf(stream, " subject: '%D'\n", this->subject);
written += fprintf(stream, " issuer: '%D'\n", this->issuer);
written += fprintf(stream, " serial: %#B\n", &this->serialNumber);
written += fprintf(stream, " validity: not before %#T, ", this->notBefore, utc);
written += fprintf(stream, " validity: not before %#T, ", &this->notBefore, utc);
if (now < this->notBefore)
{
written += fprintf(stream, "not valid yet (valid in %V)\n", now, this->notBefore);
written += fprintf(stream, "not valid yet (valid in %V)\n", &now, &this->notBefore);
}
else
{
written += fprintf(stream, "ok (expires in %V)\n", now, this->notAfter);
written += fprintf(stream, "ok\n");
}
written += fprintf(stream, " not after %#T, ", this->notAfter, utc);
written += fprintf(stream, " not after %#T, ", &this->notAfter, utc);
if (now > this->notAfter)
{
written += fprintf(stream, "expired (since %V)\n", now, this->notAfter);
written += fprintf(stream, "expired (since %V)\n", &now, &this->notAfter);
}
else
{
@@ -1146,10 +1146,10 @@ static int print(FILE *stream, const struct printf_info *info,
switch (this->status)
{
case CERT_GOOD:
written += fprintf(stream, " until %#T", this->until, utc);
written += fprintf(stream, " until %#T", &this->until, utc);
break;
case CERT_REVOKED:
written += fprintf(stream, " on %#T", this->until, utc);
written += fprintf(stream, " on %#T", &this->until, utc);
break;
case CERT_UNKNOWN:
case CERT_UNDEFINED: