diff options
| author | Randall S. Becker <randall.becker@nexbridge.ca> | 2024-03-21 21:16:11 +0000 |
|---|---|---|
| committer | Neil Horman <nhorman@openssl.org> | 2024-03-23 09:58:50 -0400 |
| commit | 10ea99bb4b65aba7e0fd139c40c0782b73dd66d6 (patch) | |
| tree | 858325d349007f23834f2efad8f96127c65b7c86 | |
| parent | f2de18a30d25bf19236963ff72c02833ae41be40 (diff) | |
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 <randall.becker@nexbridge.ca>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23926)
(cherry picked from commit 4a9e48f727ce7ad924c53a55b301e426d7e43863)
| -rw-r--r-- | crypto/sleep.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/crypto/sleep.c b/crypto/sleep.c index d9c5b35b21..ce75c7a033 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 <cextdecs.h(PROCESS_DELAY_)> /* HPNS does not support usleep for non threaded apps */ PROCESS_DELAY_(millis * 1000); -# elif defined(_SPT_MODEL_) -# include <spthread.h> -# include <spt_extensions.h> - - usleep(millis * 1000); -# else - usleep(millis * 1000); -# endif # else unsigned int s = (unsigned int)(millis / 1000); unsigned int us = (unsigned int)((millis % 1000) * 1000); |