Commit 360ef676 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

first parameter is difference in days, not years

parent 13cfb043

crypto/asn1/a_time.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *t) 
	return 0;

	}



int ASN1_TIME_diff(int *pyear, int *psec,

int ASN1_TIME_diff(int *pday, int *psec,

			const ASN1_TIME *from, const ASN1_TIME *to)

	{

	struct tm tm_from, tm_to;
@@ -225,5 +225,5 @@ int ASN1_TIME_diff(int *pyear, int *psec, 
		return 0;

	if (!asn1_time_to_tm(&tm_to, to))

		return 0;

	return OPENSSL_gmtime_diff(&tm_from, &tm_to, pyear, psec);

	return OPENSSL_gmtime_diff(&tm_from, &tm_to, pday, psec);

	}

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t) 
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,

	     time_t t, int offset_day, long offset_sec);

int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);

int ASN1_TIME_diff(int *pyear, int *psec,

int ASN1_TIME_diff(int *pday, int *psec,

			const ASN1_TIME *from, const ASN1_TIME *to);



DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)