Add ASN1_TIME_diff from OpenSSL.

The symbol is not yet exposed and will show up with tb@'s forthcoming bump

ok tb@ jsing@

4 files changed, 106 insertions, 5 deletions

diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index 7a3742fd70..9cb41cf885 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time.c,v 1.27 2015/10/19 16:32:37 beck Exp $ */
+/* $OpenBSD: a_time.c,v 1.28 2021/10/27 09:50:57 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -105,3 +105,17 @@ ASN1_TIME_free(ASN1_TIME *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &ASN1_TIME_it);
 }
+
+int
+ASN1_TIME_diff(int *pday, int *psec, const ASN1_TIME *from,
+    const ASN1_TIME *to)
+{
+    struct tm tm_from, tm_to;
+
+    if (ASN1_time_parse(from->data, from->length, &tm_from, 0) == -1)
+            return 0;
+    if (ASN1_time_parse(from->data, from->length, &tm_to, 0) == -1)
+            return 0;
+
+    return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);
+}
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 76c294ada8..43b038adaa 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.54 2020/12/08 15:06:42 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.55 2021/10/27 09:50:57 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -773,6 +773,11 @@ ASN1_TIME *d2i_ASN1_TIME(ASN1_TIME **a, const unsigned char **in, long len);
 int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **out);
 extern const ASN1_ITEM ASN1_TIME_it;
 
+#if defined(LIBRESSL_NEW_API)
+int ASN1_TIME_diff(int *pday, int *psec, const ASN1_TIME *from,
+    const ASN1_TIME *to);
+#endif
+
 extern const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it;
 
 ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index 9b2e7e5b5e..3f164c7fde 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: o_time.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: o_time.c,v 1.16 2021/10/27 09:50:56 beck Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -72,6 +72,8 @@
 
 static long date_to_julian(int y, int m, int d);
 static void julian_to_date(long jd, int *y, int *m, int *d);
+static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
+    long *pday, int *psec);
 
 int
 OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
@@ -131,6 +133,85 @@ OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
 
 }
 
+int
+OPENSSL_gmtime_diff(int *pday, int *psec, const struct tm *from,
+    const struct tm *to)
+{
+        int from_sec, to_sec, diff_sec;
+        long from_jd, to_jd, diff_day;
+
+        if (!julian_adj(from, 0, 0, &from_jd, &from_sec))
+                return 0;
+        if (!julian_adj(to, 0, 0, &to_jd, &to_sec))
+                return 0;
+        diff_day = to_jd - from_jd;
+        diff_sec = to_sec - from_sec;
+        /* Adjust differences so both positive or both negative */
+        if (diff_day > 0 && diff_sec < 0) {
+                diff_day--;
+                diff_sec += SECS_PER_DAY;
+        }
+        if (diff_day < 0 && diff_sec > 0) {
+                diff_day++;
+                diff_sec -= SECS_PER_DAY;
+        }
+
+        if (pday)
+                *pday = (int)diff_day;
+        if (psec)
+                *psec = diff_sec;
+
+        return 1;
+
+}
+
+/* Convert tm structure and offset into julian day and seconds */
+static int
+julian_adj(const struct tm *tm, int off_day, long offset_sec, long *pday,
+    int *psec)
+{
+        int time_year, time_month, time_day;
+        long offset_day, time_jd;
+        int offset_hms;
+
+        /* split offset into days and day seconds */
+        offset_day = offset_sec / SECS_PER_DAY;
+        /* Avoid sign issues with % operator */
+        offset_hms = offset_sec - (offset_day * SECS_PER_DAY);
+        offset_day += off_day;
+        /* Add current time seconds to offset */
+        offset_hms += tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
+        /* Adjust day seconds if overflow */
+        if (offset_hms >= SECS_PER_DAY) {
+                offset_day++;
+                offset_hms -= SECS_PER_DAY;
+        } else if (offset_hms < 0) {
+                offset_day--;
+                offset_hms += SECS_PER_DAY;
+        }
+
+        /*
+         * Convert date of time structure into a Julian day number.
+         */
+
+        time_year = tm->tm_year + 1900;
+        time_month = tm->tm_mon + 1;
+        time_day = tm->tm_mday;
+
+        time_jd = date_to_julian(time_year, time_month, time_day);
+
+        /* Work out Julian day of new date */
+        time_jd += offset_day;
+
+        if (time_jd < 0)
+                return 0;
+
+        *pday = time_jd;
+        *psec = offset_hms;
+
+        return 1;
+}
+
 /* Convert date to and from julian day
  * Uses Fliegel & Van Flandern algorithm
  */
diff --git a/src/lib/libcrypto/o_time.h b/src/lib/libcrypto/o_time.h
index 8c6301db31..064f2cc237 100644
--- a/src/lib/libcrypto/o_time.h
+++ b/src/lib/libcrypto/o_time.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: o_time.h,v 1.7 2016/12/21 15:49:29 jsing Exp $ */
+/* $OpenBSD: o_time.h,v 1.8 2021/10/27 09:50:56 beck Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -64,7 +64,8 @@
 __BEGIN_HIDDEN_DECLS
 
 int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec);
+int OPENSSL_gmtime_diff(int *pday, int *psec, const struct tm *from,
+    const struct tm *to);
 
 __END_HIDDEN_DECLS
-
 #endif