From e8d3f9d42c34f268a181661ca4aaedfa066c0a0a Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 7 Oct 2022 15:29:40 +0000
Subject:  Add workaround to bearssl regression with
 BR_FEATURE_X509_TIME_CALLBACK

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/sbearssl/sbearssl_x509_minimal_set_tai.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/sbearssl/sbearssl_x509_minimal_set_tai.c')

diff --git a/src/sbearssl/sbearssl_x509_minimal_set_tai.c b/src/sbearssl/sbearssl_x509_minimal_set_tai.c
index 58a1a4a..0ca9c9d 100644
--- a/src/sbearssl/sbearssl_x509_minimal_set_tai.c
+++ b/src/sbearssl/sbearssl_x509_minimal_set_tai.c
@@ -1,18 +1,14 @@
 /* ISC license. */
 
+#include <stdint.h>
 #include <bearssl.h>
 
-#include <skalibs/uint64.h>
-#include <skalibs/tai.h>
-#include <skalibs/djbtime.h>
-
 #include <s6-networking/sbearssl.h>
 
 int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *ctx, tai const *t)
 {
-  uint64_t u ;
-  if (!utc_from_tai(&u, t)) return 0 ;
-  u -= TAI_MAGIC ;
-  br_x509_minimal_set_time(ctx, (uint32_t)(u / 86400 + 719528), u % 86400) ;
+  uint32_t days, seconds ;
+  if (!sbearssl_dayseconds_from_tai(&days, &seconds, t)) return 0 ;
+  br_x509_minimal_set_time(ctx, days, seconds) ;
   return 1 ;
 }
-- 
cgit v1.3.1