generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix to stop X509_time_adj() using GeneralizedTime.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-01-20 13:38:45 +00:00
parent bfcec27d61
commit ba8e28248f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -3,6 +3,15 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
*) Make X509_time_adj() cope with the new behaviour of ASN1_TIME_new().
Previously it initialised the 'type' argument to V_ASN1_UTCTIME which
effectively meant GeneralizedTime would never be used. Now it
is initialised to -1 but X509_time_adj() now has to check the value
and use ASN1_TIME_set() if the value is not V_ASN1_UTCTIME or
V_ASN1_GENERALIZEDTIME, without this it always uses GeneralizedTime.
[Steve Henson, reported by Kenneth R. Robinette
<support@securenetterm.com>]
*) Fixes to BN_to_ASN1_INTEGER when bn is zero. This would previously *) Fixes to BN_to_ASN1_INTEGER when bn is zero. This would previously
result in a zero length in the ASN1_INTEGER structure which was result in a zero length in the ASN1_INTEGER structure which was
not consistent with the structure when d2i_ASN1_INTEGER() was used not consistent with the structure when d2i_ASN1_INTEGER() was used

8
crypto/x509/x509_vfy.c
View File

@ -645,14 +645,16 @@ ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj)
ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *in_tm) ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *in_tm)
{ {
time_t t; time_t t;
int type = -1;
if (in_tm) t = *in_tm; if (in_tm) t = *in_tm;
else time(&t); else time(&t);
t+=adj; t+=adj;
if (!s) return ASN1_TIME_set(s, t); if (s) type = s->type;
if (s->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_set(s,t); if (type == V_ASN1_UTCTIME) return ASN1_UTCTIME_set(s,t);
return ASN1_GENERALIZEDTIME_set(s, t); if (type == V_ASN1_GENERALIZEDTIME) return ASN1_GENERALIZEDTIME_set(s, t);
return ASN1_TIME_set(s, t);
} }
int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain) int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)