openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename ossl_sleep calls to OSSL_sleep everywhere 

Also, remove inclusions of internal/e_os.h where it seems no longer
necessary.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19330)
This commit is contained in:
Richard Levitte 2022-10-03 07:22:52 +02:00
parent 82d28c6b3c
commit 5139dec255
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cmp.c
View File

@ -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;
}

6
apps/lib/http_server.c
View File

@ -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);

4
apps/s_server.c
View File

@ -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 */

2
crypto/bio/bio_lib.c
View File

@ -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;
}

3
crypto/cmp/cmp_client.c
View File

@ -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;

3
test/helpers/ssltestlib.c
View File

@ -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);