From: Randall S. Becker Date: Thu, 21 Mar 2024 21:16:11 +0000 (+0000) Subject: Correct OSSL_sleep for NonStop PUT model by introducing sleep(). X-Git-Tag: openssl-3.4.0-alpha1~802 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a9e48f727ce7ad924c53a55b301e426d7e43863;p=thirdparty%2Fopenssl.git Correct OSSL_sleep for NonStop PUT model by introducing sleep(). This fix also removes SPT model support as it was previously deprecated. Upcoming threading models on the platform should be supportable without change to this method. Fixes: #23923 Fixes: #23927 Fixes: #23928 Signed-off-by: Randall S. Becker Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/23926) --- diff --git a/crypto/sleep.c b/crypto/sleep.c index d9c5b35b215..ce75c7a0330 100644 --- a/crypto/sleep.c +++ b/crypto/sleep.c @@ -22,20 +22,11 @@ void OSSL_sleep(uint64_t millis) ts.tv_sec = (long int) (millis / 1000); ts.tv_nsec = (long int) (millis % 1000) * 1000000ul; nanosleep(&ts, NULL); -# elif defined(__TANDEM) -# if !defined(_REENTRANT) +# elif defined(__TANDEM) && !defined(_REENTRANT) # include /* HPNS does not support usleep for non threaded apps */ PROCESS_DELAY_(millis * 1000); -# elif defined(_SPT_MODEL_) -# include -# include - - usleep(millis * 1000); -# else - usleep(millis * 1000); -# endif # else unsigned int s = (unsigned int)(millis / 1000); unsigned int us = (unsigned int)((millis % 1000) * 1000);