diff options
| -rw-r--r-- | apps/cmp.c | 2 | ||||
| -rw-r--r-- | apps/lib/http_server.c | 6 | ||||
| -rw-r--r-- | apps/s_server.c | 4 | ||||
| -rw-r--r-- | crypto/bio/bio_lib.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_client.c | 3 | ||||
| -rw-r--r-- | test/helpers/ssltestlib.c | 3 |
6 files changed, 9 insertions, 11 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index bac54f1265..24672144fe 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2688,7 +2688,7 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx) prog, 0, 0); if (ret == 0) { /* no request yet */ if (retry) { - ossl_sleep(1000); + OSSL_sleep(1000); retry = 0; continue; } diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c index 3f9f884c69..03afd715be 100644 --- a/apps/lib/http_server.c +++ b/apps/lib/http_server.c @@ -65,7 +65,7 @@ static void killall(int ret, pid_t *kidpids) if (kidpids[i] != 0) (void)kill(kidpids[i], SIGTERM); OPENSSL_free(kidpids); - ossl_sleep(1000); + OSSL_sleep(1000); exit(ret); } @@ -141,7 +141,7 @@ void spawn_loop(const char *prog) "child process: %ld, term signal %d%s", (long)fpid, WTERMSIG(status), dumped); } - ossl_sleep(1000); + OSSL_sleep(1000); } break; } else if (errno != EINTR) { @@ -156,7 +156,7 @@ void spawn_loop(const char *prog) switch (fpid = fork()) { case -1: /* error */ /* System critically low on memory, pause and try again later */ - ossl_sleep(30000); + OSSL_sleep(30000); break; case 0: /* child */ OPENSSL_free(kidpids); diff --git a/apps/s_server.c b/apps/s_server.c index c04da1fc68..8a573d4414 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -3184,7 +3184,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context) continue; } #endif - ossl_sleep(1000); + OSSL_sleep(1000); continue; } } else if (i == 0) { /* end of input */ @@ -3625,7 +3625,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context) continue; } #endif - ossl_sleep(1000); + OSSL_sleep(1000); continue; } } else if (i == 0) { /* end of input */ diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index a0a83da8cb..cceef45095 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -978,7 +978,7 @@ static int bio_wait(BIO *bio, time_t max_time, unsigned int nap_milliseconds) if ((unsigned long)sec_diff * 1000 < nap_milliseconds) nap_milliseconds = (unsigned int)sec_diff * 1000; } - ossl_sleep(nap_milliseconds); + OSSL_sleep(nap_milliseconds); return 1; } diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index ec20af3aa1..26635db850 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -11,7 +11,6 @@ #include "cmp_local.h" #include "internal/cryptlib.h" -#include "internal/e_os.h" /* ossl_sleep() */ /* explicit #includes not strictly needed since implied by the above: */ #include <openssl/bio.h> @@ -332,7 +331,7 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid, OSSL_CMP_MSG_free(prep); prep = NULL; if (sleep) { - ossl_sleep((unsigned long)(1000 * check_after)); + OSSL_sleep((unsigned long)(1000 * check_after)); } else { if (checkAfter != NULL) *checkAfter = (int)check_after; diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c index 65077a2d1d..13564a08a7 100644 --- a/test/helpers/ssltestlib.c +++ b/test/helpers/ssltestlib.c @@ -12,7 +12,6 @@ #include "internal/nelem.h" #include "ssltestlib.h" #include "../testutil.h" -#include "internal/e_os.h" /* for ossl_sleep() etc. */ #ifdef OPENSSL_SYS_UNIX # include <unistd.h> @@ -1164,7 +1163,7 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want, * give the DTLS timer a chance to do something. We only do this for * the first few times to prevent hangs. */ - ossl_sleep(50); + OSSL_sleep(50); } } while (retc <=0 || rets <= 0); |