diff options
author | Richard Levitte <levitte@openssl.org> | 2022-10-03 07:10:34 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2022-10-06 08:01:09 +0200 |
commit | 82d28c6b3cbd8074faaa34cc2ce57dacc580792f (patch) | |
tree | ee3ec2399066e8e508512d4e4c7eb6342f44c3a9 /util | |
parent | Move the SSLv3 crypto code into the new record layer (diff) | |
download | openssl-82d28c6b3cbd8074faaa34cc2ce57dacc580792f.tar.xz openssl-82d28c6b3cbd8074faaa34cc2ce57dacc580792f.zip |
Rename ossl_sleep() to OSSL_sleep() and make it public
ossl_sleep() was implemented as a static inline function in internal/e_os.h,
using usleep() on Unix and Sleep() on Windows. So far well and good.
However, it also has a fallback implementation for systems that do not have
usleep() or Sleep(), and that implementation happens to use ossl_time_now(),
which is a normal function, private to libcrypto, and is judged to be too
complex to sanely make into a static inline function.
This fallback creates a problem, because we do use ossl_sleep() in apps/ and
a few test programs in test/, and when they are linked with libcrypto in
shared library form, ossl_time_now() can't be found, since it's not publicly
exposed.
Something needs to give, and the easiest, and hopefully sanest answer is to
make ossl_sleep() a publicly exposed function, which requires a slight name
change.
Documentation and 'make update' result included.
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)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 4c5cd7907d..f9c1395859 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5465,3 +5465,4 @@ EVP_PKEY_auth_encapsulate_init ? 3_1_0 EXIST::FUNCTION: EVP_PKEY_auth_decapsulate_init ? 3_1_0 EXIST::FUNCTION: PKCS12_SAFEBAG_set0_attrs ? 3_1_0 EXIST::FUNCTION: PKCS12_create_ex2 ? 3_1_0 EXIST::FUNCTION: +OSSL_sleep ? 3_1_0 EXIST::FUNCTION: |