From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Sep 2022 10:32:26 +0000 (+0200)
Subject: Fix the OSSL_TIME fallback in include/internal/e_os.h
X-Git-Tag: openssl-3.2.0-alpha1~2087
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb51673e522855400a11de4569a3612c98c7b685;p=thirdparty%2Fopenssl.git

Fix the OSSL_TIME fallback in include/internal/e_os.h

There's a fallback `ossl_sleep()` that uses `OSSL_TIME`.  However,
nothing was done to ensure that `OSSL_TIME` is defined.

Adding an inclusion of "internal/time.h" should be enough.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19214)
---

diff --git a/include/internal/e_os.h b/include/internal/e_os.h
index 0e520364344..1be20f61f91 100644
--- a/include/internal/e_os.h
+++ b/include/internal/e_os.h
@@ -320,6 +320,7 @@ static ossl_inline void ossl_sleep(unsigned long millis)
 }
 #else
 /* Fallback to a busy wait */
+# include "internal/time.h"
 static ossl_inline void ossl_sleep(unsigned long millis)
 {
     const OSSL_TIME finish = ossl_time_add(ossl_time_now(), ossl_ms2time(millis));