* gpgmeplug.c: new macro days_to_seconds().

this also fixes the dividing factor.
	(signatureCertificateDaysLeftToExpiry)
        (preceiverCertificateDaysLeftToExpiry): using the new macro

	(caCertificateDaysLeftToExpiry)
	(rootCertificateDaysLeftToExpiry): using new macro in deactivated code.
This commit is contained in:
Bernhard Reiter 2002-06-28 14:51:12 +00:00
parent 4114f4400d
commit e866179ce6
2 changed files with 18 additions and 12 deletions

View File

@ -1,3 +1,14 @@
2002-06-28 Bernhard Reiter <bernhard@intevation.de>
* gpgmeplug.c: new macro days_to_seconds().
this also fixes the dividing factor.
(signatureCertificateDaysLeftToExpiry)
(preceiverCertificateDaysLeftToExpiry): using the new macro
(caCertificateDaysLeftToExpiry)
(rootCertificateDaysLeftToExpiry): using new macro in deactivated code.
2002-06-27 Steffen Hansen <steffen@hrhansen.dk> 2002-06-27 Steffen Hansen <steffen@hrhansen.dk>
* gpgmeplug.c: Fixed pattern related bug. * gpgmeplug.c: Fixed pattern related bug.

View File

@ -154,6 +154,9 @@
#include "cryptplug.h" #include "cryptplug.h"
#define days_from_seconds(x) ((x)/86400)
typedef struct { typedef struct {
const char* bugURL; const char* bugURL;
const char* signatureKeyCertificate; const char* signatureKeyCertificate;
@ -512,9 +515,7 @@ int signatureCertificateDaysLeftToExpiry( const char* certificate )
time_t expire_time = gpgme_key_get_ulong_attr( time_t expire_time = gpgme_key_get_ulong_attr(
rKey,GPGME_ATTR_EXPIRE, NULL, 0 ); rKey,GPGME_ATTR_EXPIRE, NULL, 0 );
time_t cur_time = time (NULL); time_t cur_time = time (NULL);
daysLeft = expire_time - cur_time; daysLeft = days_from_seconds(expire_time - cur_time);
// convert seconds into days
daysLeft /= 43200;
gpgme_key_release( rKey ); gpgme_key_release( rKey );
} }
} }
@ -576,9 +577,7 @@ int caCertificateDaysLeftToExpiry( const char* certificate )
NULL, 0 ); NULL, 0 );
time_t cur_time = time (NULL); time_t cur_time = time (NULL);
daysLeft = expire_time - cur_time; daysLeft = days_from_seconds(expire_time - cur_time);
// convert seconds into days
daysLeft /= 43200;
gpgme_key_release( rKey ); gpgme_key_release( rKey );
} }
} }
@ -640,9 +639,7 @@ int rootCertificateDaysLeftToExpiry( const char* certificate )
NULL, 0 ); NULL, 0 );
time_t cur_time = time (NULL); time_t cur_time = time (NULL);
daysLeft = expire_time - cur_time; daysLeft = days_from_seconds(expire_time - cur_time);
// convert seconds into days
daysLeft /= 43200;
gpgme_key_release( rKey ); gpgme_key_release( rKey );
} }
} }
@ -803,9 +800,7 @@ int receiverCertificateDaysLeftToExpiry( const char* certificate )
time_t expire_time = gpgme_key_get_ulong_attr( time_t expire_time = gpgme_key_get_ulong_attr(
rKey,GPGME_ATTR_EXPIRE, NULL, 0 ); rKey,GPGME_ATTR_EXPIRE, NULL, 0 );
time_t cur_time = time (NULL); time_t cur_time = time (NULL);
daysLeft = expire_time - cur_time; daysLeft = days_from_seconds(expire_time - cur_time);
// convert seconds into days
daysLeft /= 43200;
gpgme_key_release( rKey ); gpgme_key_release( rKey );
} }
} }