Land #1056 - remove timegm compat

11 files changed, 22 insertions, 266 deletions

diff --git a/.gitignore b/.gitignore
index 0bc4f02..678e87d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -241,7 +241,6 @@ include/openssl/*.h
 !/crypto/compat/getpagesize.c
 !/crypto/compat/posix_win.c
 !/crypto/compat/bsd_asprintf.c
-!/crypto/compat/timegm.c
 !/crypto/compat/ui_openssl_win.c
 !/crypto/compat/crypto_lock_win.c
 !/crypto/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95fe601..438e622 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,11 +255,6 @@ if(HAVE_STRTONUM)
         add_definitions(-DHAVE_STRTONUM)
 endif()
 
-check_function_exists(timegm HAVE_TIMEGM)
-if(HAVE_TIMEGM)
-        add_definitions(-DHAVE_TIMEGM)
-endif()
-
 check_function_exists(arc4random_buf HAVE_ARC4RANDOM_BUF)
 if(HAVE_ARC4RANDOM_BUF)
         add_definitions(-DHAVE_ARC4RANDOM_BUF)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 5c0f3e6..b3e09b3 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -721,11 +721,6 @@ if(NOT HAVE_SYSLOG_R)
         set(COMPAT_SRC ${COMPAT_SRC} compat/syslog_r.c)
 endif()
 
-if(NOT HAVE_TIMEGM)
-        # XXX - Remove after next bump once libtls, ocspcheck, and asn1time are fixed.
-        set(COMPAT_SRC ${COMPAT_SRC} compat/timegm.c)
-endif()
-
 if(NOT HAVE_EXPLICIT_BZERO)
         if(WIN32)
                 set(COMPAT_SRC ${COMPAT_SRC} compat/explicit_bzero_win.c)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 81d4524..08c632d 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -147,10 +147,6 @@ endif
 endif
 endif
 
-if !HAVE_TIMEGM
-libcompat_la_SOURCES += compat/timegm.c
-endif
-
 if !HAVE_REALLOCARRAY
 libcompat_la_SOURCES += compat/reallocarray.c
 endif
diff --git a/crypto/compat/timegm.c b/crypto/compat/timegm.c
deleted file mode 100644
index 2658445..0000000
--- a/crypto/compat/timegm.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * ----------------------------------------------------------------------
- * Copyright © 2005-2014 Rich Felker, et al.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * ----------------------------------------------------------------------
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-
-/* 2000-03-01 (mod 400 year, immediately after feb29 */
-#define LEAPOCH (946684800LL + 86400*(31+29))
-
-#define DAYS_PER_400Y (365*400 + 97)
-#define DAYS_PER_100Y (365*100 + 24)
-#define DAYS_PER_4Y   (365*4   + 1)
-
-static int __month_to_secs(int month, int is_leap)
-{
-        static const int secs_through_month[] = {
-                0, 31*86400, 59*86400, 90*86400,
-                120*86400, 151*86400, 181*86400, 212*86400,
-                243*86400, 273*86400, 304*86400, 334*86400 };
-        int t = secs_through_month[month];
-        if (is_leap && month >= 2) t+=86400;
-        return t;
-}
-
-static long long __year_to_secs(long long year, int *is_leap)
-{
-        if (year-2ULL <= 136) {
-                int y = year;
-                int leaps = (y-68)>>2;
-                if (!((y-68)&3)) {
-                        leaps--;
-                        if (is_leap) *is_leap = 1;
-                } else if (is_leap) *is_leap = 0;
-                return 31536000*(y-70) + 86400*leaps;
-        }
-
-        int cycles, centuries, leaps, rem;
-
-        if (!is_leap) is_leap = &(int){0};
-        cycles = (year-100) / 400;
-        rem = (year-100) % 400;
-        if (rem < 0) {
-                cycles--;
-                rem += 400;
-        }
-        if (!rem) {
-                *is_leap = 1;
-                centuries = 0;
-                leaps = 0;
-        } else {
-                if (rem >= 200) {
-                        if (rem >= 300) centuries = 3, rem -= 300;
-                        else centuries = 2, rem -= 200;
-                } else {
-                        if (rem >= 100) centuries = 1, rem -= 100;
-                        else centuries = 0;
-                }
-                if (!rem) {
-                        *is_leap = 0;
-                        leaps = 0;
-                } else {
-                        leaps = rem / 4U;
-                        rem %= 4U;
-                        *is_leap = !rem;
-                }
-        }
-
-        leaps += 97*cycles + 24*centuries - *is_leap;
-
-        return (year-100) * 31536000LL + leaps * 86400LL + 946684800 + 86400;
-}
-
-static long long __tm_to_secs(const struct tm *tm)
-{
-        int is_leap;
-        long long year = tm->tm_year;
-        int month = tm->tm_mon;
-        if (month >= 12 || month < 0) {
-                int adj = month / 12;
-                month %= 12;
-                if (month < 0) {
-                        adj--;
-                        month += 12;
-                }
-                year += adj;
-        }
-        long long t = __year_to_secs(year, &is_leap);
-        t += __month_to_secs(month, is_leap);
-        t += 86400LL * (tm->tm_mday-1);
-        t += 3600LL * tm->tm_hour;
-        t += 60LL * tm->tm_min;
-        t += tm->tm_sec;
-        return t;
-}
-
-static int __secs_to_tm(long long t, struct tm *tm)
-{
-        long long days, secs;
-        int remdays, remsecs, remyears;
-        int qc_cycles, c_cycles, q_cycles;
-        int years, months;
-        int wday, yday, leap;
-        static const char days_in_month[] = {31,30,31,30,31,31,30,31,30,31,31,29};
-
-        /* Reject time_t values whose year would overflow int */
-        if (t < INT_MIN * 31622400LL || t > INT_MAX * 31622400LL)
-                return -1;
-
-        secs = t - LEAPOCH;
-        days = secs / 86400;
-        remsecs = secs % 86400;
-        if (remsecs < 0) {
-                remsecs += 86400;
-                days--;
-        }
-
-        wday = (3+days)%7;
-        if (wday < 0) wday += 7;
-
-        qc_cycles = days / DAYS_PER_400Y;
-        remdays = days % DAYS_PER_400Y;
-        if (remdays < 0) {
-                remdays += DAYS_PER_400Y;
-                qc_cycles--;
-        }
-
-        c_cycles = remdays / DAYS_PER_100Y;
-        if (c_cycles == 4) c_cycles--;
-        remdays -= c_cycles * DAYS_PER_100Y;
-
-        q_cycles = remdays / DAYS_PER_4Y;
-        if (q_cycles == 25) q_cycles--;
-        remdays -= q_cycles * DAYS_PER_4Y;
-
-        remyears = remdays / 365;
-        if (remyears == 4) remyears--;
-        remdays -= remyears * 365;
-
-        leap = !remyears && (q_cycles || !c_cycles);
-        yday = remdays + 31 + 28 + leap;
-        if (yday >= 365+leap) yday -= 365+leap;
-
-        years = remyears + 4*q_cycles + 100*c_cycles + 400*qc_cycles;
-
-        for (months=0; days_in_month[months] <= remdays; months++)
-                remdays -= days_in_month[months];
-
-        if (years+100 > INT_MAX || years+100 < INT_MIN)
-                return -1;
-
-        tm->tm_year = years + 100;
-        tm->tm_mon = months + 2;
-        if (tm->tm_mon >= 12) {
-                tm->tm_mon -=12;
-                tm->tm_year++;
-        }
-        tm->tm_mday = remdays + 1;
-        tm->tm_wday = wday;
-        tm->tm_yday = yday;
-
-        tm->tm_hour = remsecs / 3600;
-        tm->tm_min = remsecs / 60 % 60;
-        tm->tm_sec = remsecs % 60;
-
-        return 0;
-}
-
-#ifdef _WIN32
-struct tm *__gmtime_r(const time_t *t, struct tm *tm)
-{
-        if (__secs_to_tm(*t, tm) < 0) {
-                errno = EOVERFLOW;
-                return 0;
-        }
-        tm->tm_isdst = 0;
-        return tm;
-}
-#endif
-
-time_t timegm(struct tm *tm)
-{
-        struct tm new;
-        long long t = __tm_to_secs(tm);
-        if (__secs_to_tm(t, &new) < 0) {
-                errno = EOVERFLOW;
-                return -1;
-        }
-#if SIZEOF_TIME_T != 8
-        if (t > (long long)INT_MAX || t < (long long)INT_MIN) {
-                errno = EOVERFLOW;
-                return -1;
-        }
-#endif
-        *tm = new;
-        tm->tm_isdst = 0;
-        return t;
-}
diff --git a/include/compat/time.h b/include/compat/time.h
index 2748521..a0f6d29 100644
--- a/include/compat/time.h
+++ b/include/compat/time.h
@@ -24,15 +24,6 @@
 #ifndef LIBCRYPTOCOMPAT_TIME_H
 #define LIBCRYPTOCOMPAT_TIME_H
 
-#ifdef _WIN32
-struct tm *__gmtime_r(const time_t * t, struct tm * tm);
-#define gmtime_r(tp, tm) __gmtime_r(tp, tm)
-#endif
-
-#ifndef HAVE_TIMEGM
-time_t timegm(struct tm *tm);
-#endif
-
 #ifndef CLOCK_MONOTONIC
 #define CLOCK_MONOTONIC CLOCK_REALTIME
 #endif
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index 50fb8e1..40df15b 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -37,7 +37,6 @@ AM_CONDITIONAL([HAVE_STRNDUP], [test "x$ac_cv_func_strndup" = xyes])
 AM_CONDITIONAL([HAVE_STRNLEN], [test "x$ac_cv_func_strnlen" = xyes])
 AM_CONDITIONAL([HAVE_STRSEP], [test "x$ac_cv_func_strsep" = xyes])
 AM_CONDITIONAL([HAVE_STRTONUM], [test "x$ac_cv_func_strtonum" = xyes])
-AM_CONDITIONAL([HAVE_TIMEGM], [test "x$ac_cv_func_timegm" = xyes])
 AM_CONDITIONAL([HAVE_GETPROGNAME], [test "x$ac_cv_func_getprogname" = xyes])
 AM_CONDITIONAL([HAVE_SYSLOG], [test "x$ac_cv_func_syslog" = xyes])
 AM_CONDITIONAL([HAVE_SYSLOG_R], [test "x$ac_cv_func_syslog_r" = xyes])
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6861bd3..3497cb5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -101,6 +101,9 @@ add_test(asn1test asn1test)
 add_executable(asn1time asn1time.c)
 target_link_libraries(asn1time ${OPENSSL_TEST_LIBS})
 add_test(asn1time asn1time)
+if(SMALL_TIME_T)
+        set_property(TEST asn1time PROPERTY WILL_FAIL TRUE)
+endif()
 
 # asn1x509
 add_executable(asn1x509 asn1x509.c)
@@ -584,11 +587,7 @@ add_test(rfc3779 rfc3779)
 # rfc5280time
 add_executable(rfc5280time rfc5280time.c)
 target_link_libraries(rfc5280time ${OPENSSL_TEST_LIBS})
-if(SMALL_TIME_T)
-        add_test(rfc5280time ${CMAKE_CURRENT_SOURCE_DIR}/rfc5280time_small.test)
-else()
-        add_test(rfc5280time rfc5280time)
-endif()
+add_test(rfc5280time rfc5280time)
 
 # rmd_test
 add_executable(rmd_test rmd_test.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 57e2acf..0e19106 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ LDADD = libtest.la $(PLATFORM_LDADD) $(PROG_LDADD)
 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
 
 TESTS =
+XFAIL_TESTS =
 check_PROGRAMS =
 EXTRA_DIST = CMakeLists.txt
 DISTCLEANFILES = pidwraptest.txt
@@ -119,9 +120,15 @@ check_PROGRAMS += asn1test
 asn1test_SOURCES = asn1test.c
 
 # asn1time
-TESTS += asn1time
 check_PROGRAMS += asn1time
 asn1time_SOURCES = asn1time.c
+if SMALL_TIME_T
+TESTS += asn1time_small.test
+XFAIL_TESTS += asn1time_small.test
+else
+TESTS += asn1time
+endif
+EXTRA_DIST += asn1time_small.test
 
 # asn1x509
 TESTS += asn1x509
@@ -617,12 +624,7 @@ rfc3779_SOURCES = rfc3779.c
 # rfc5280time
 check_PROGRAMS += rfc5280time
 rfc5280time_SOURCES = rfc5280time.c
-if SMALL_TIME_T
-TESTS += rfc5280time_small.test
-else
 TESTS += rfc5280time
-endif
-EXTRA_DIST += rfc5280time_small.test
 
 # rmd_test
 TESTS += rmd_test
diff --git a/tests/asn1time_small.test b/tests/asn1time_small.test
new file mode 100755
index 0000000..94fbebf
--- /dev/null
+++ b/tests/asn1time_small.test
@@ -0,0 +1,10 @@
+#!/bin/sh
+echo 1..1
+TEST=./asn1time
+if [ -e ./asn1time.exe ]; then
+        TEST=./asn1time.exe
+fi
+
+# map test failure to XFAIL and success to XPASS
+$TEST || echo -n "not "
+echo "ok # this system is unable to represent times past 2038"
diff --git a/tests/rfc5280time_small.test b/tests/rfc5280time_small.test
deleted file mode 100755
index 3730597..0000000
--- a/tests/rfc5280time_small.test
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-echo 1..2
-TEST=./rfc5280time
-if [ -e ./rfc5280time.exe ]; then
-        TEST=./rfc5280time.exe
-fi
-$TEST
-echo "ok 1"
-echo "ok 2 - rfc5280time_64-bit # SKIP this system is unable to represent times past 2038"