asn1_string_to_time_t: Use timegm on FreeBSD.

[openssl.git] / crypto / asn1 / a_time.c

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index e9df23af920decca55a6ee5e7cb23d69f5e518a1..4b9a0641fb10627c9f8713b663e403166999139e 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -597,11 +597,17 @@ int ASN1_TIME_compare(const ASN1_TIME *a, const ASN1_TIME *b)
 # define timezone _timezone
 #endif
 
 # define timezone _timezone
 #endif
 

+#ifdef __FreeBSD__
+# define USE_TIMEGM
+#endif
+

 time_t asn1_string_to_time_t(const char *asn1_string)
 {
     ASN1_TIME *timestamp_asn1 = NULL;
     struct tm *timestamp_tm = NULL;
 time_t asn1_string_to_time_t(const char *asn1_string)
 {
     ASN1_TIME *timestamp_asn1 = NULL;
     struct tm *timestamp_tm = NULL;

+#ifndef USE_TIMEGM

     time_t timestamp_local;
     time_t timestamp_local;

+#endif

     time_t timestamp_utc;
 
     timestamp_asn1 = ASN1_TIME_new();
     time_t timestamp_utc;
 
     timestamp_asn1 = ASN1_TIME_new();


@@ -619,10 +625,15 @@ time_t asn1_string_to_time_t(const char *asn1_string)
         return -1;
     }
 
         return -1;
     }
 

+#ifdef USE_TIMEGM
+    timestamp_utc = timegm(timestamp_tm);
+    OPENSSL_free(timestamp_tm);
+#else

     timestamp_local = mktime(timestamp_tm);
     OPENSSL_free(timestamp_tm);
 
     timestamp_utc = timestamp_local - timezone;
     timestamp_local = mktime(timestamp_tm);
     OPENSSL_free(timestamp_tm);
 
     timestamp_utc = timestamp_local - timezone;

+#endif

 
     ASN1_TIME_free(timestamp_asn1);
     return timestamp_utc;
 
     ASN1_TIME_free(timestamp_asn1);
     return timestamp_utc;