From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Wed, 4 Oct 2023 21:21:00 +0000 (-0600)
Subject: Restore GeneralizedTime_constraint()
X-Git-Tag: 1.6.0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=745f5dfe1c2d1eb3fdaf3f114c82f8fc09e3455f;p=thirdparty%2FFORT-validator.git

Restore GeneralizedTime_constraint()

Turns out this is being used, and trivial to implement.
---

diff --git a/src/asn1/asn1c/GeneralizedTime.c b/src/asn1/asn1c/GeneralizedTime.c
index e9b12a6b..123557d6 100644
--- a/src/asn1/asn1c/GeneralizedTime.c
+++ b/src/asn1/asn1c/GeneralizedTime.c
@@ -108,11 +108,7 @@ GeneralizedTime_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
                            void *app_key) {
     const GeneralizedTime_t *st = (const GeneralizedTime_t *)sptr;
 
-	/* asn_GT2time() no longer supports NULL tm and no GMT */
-	fprintf(stderr, "GeneralizedTime_constraint() is not implemented for now.\n");
-	abort();
-
-	if(asn_GT2time(st, 0) != 0) {
+	if(asn_GT2time(st, NULL) != 0) {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: Invalid time format: %s (%s:%d)",
 			td->name, strerror(errno), __FILE__, __LINE__);
@@ -395,12 +391,10 @@ asn_GT2time_frac(const GeneralizedTime_t *st, int *frac_value, int *frac_digits,
 	tm_s.tm_year -= 1900;
 	tm_s.tm_isdst = 0;
 
-	*ret_tm = tm_s;
-
-	/* Fractions of seconds */
+	/* Return */
 	if(frac_value) *frac_value = fvalue;
 	if(frac_digits) *frac_digits = fdigits;
-
+	if(ret_tm) *ret_tm = tm_s;
 	return 0;
 
 garbage: