diff options
author | Randall S. Becker <rsbecker@nexbridge.com> | 2020-10-29 10:17:25 -0500 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-11-04 17:02:38 +0100 |
commit | 9750b4d39c610bac89fde009c3b22147eee0249c (patch) | |
tree | b0cf02969f2d7cca93cc2f09fdcea3fc248c1d05 /include | |
parent | 23fb3661cf914eb6a0776abec629b0e3e5976b7f (diff) |
Moved OPENSSL_fork_prepare,_parent,_child from init.c to threads_pthread.c.
These methods should ultimately be deprecated. The move is to insulate
non-UNIX platforms from these undefined symbols.
CLA: Permission is granted by the author to the OpenSSL team to use
these modifications.
Fixes #13273
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13276)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/crypto.h.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in index b84712f227..1036da9a2b 100644 --- a/include/openssl/crypto.h.in +++ b/include/openssl/crypto.h.in @@ -389,9 +389,11 @@ int OPENSSL_isservice(void); void OPENSSL_init(void); # ifdef OPENSSL_SYS_UNIX -void OPENSSL_fork_prepare(void); -void OPENSSL_fork_parent(void); -void OPENSSL_fork_child(void); +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_prepare(void); +OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_parent(void); +OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_child(void); +# endif # endif struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result); |