It seems that mktime does what is required here. Certainly timegm() can

not be used because it is not available on all systems (most notably,
win32).

1 files changed, 1 insertions, 6 deletions

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index f6652e7081..b855867dc1 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -291,10 +291,5 @@ time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s)
 		}
 #undef g2
 
-	return timegm(&tm)-offset*60; /* FIXME: timegm is non-standard,
-	                               * typically we only have mktime (which
-	                               * interprets the struct tm according to
-	                               * the current time zone setting).
-	                               * Also time_t is inappropriate for general
-	                               * UTC times because it may a 32 bit type. */
+	return mktime(&tm)-offset*60;
 	}