The branch master has been updated via c57a59b1a0395733c89a56d3d5fc65a4bf576e4e (commit) from d93bded6aa2852e681de2ed76fb43c415687af68 (commit)
- Log ----------------------------------------------------------------- commit c57a59b1a0395733c89a56d3d5fc65a4bf576e4e Author: Pauli <paul.d...@oracle.com> Date: Sat Sep 26 08:37:38 2020 +1000 todo: remove fork protection todo comment, it isn't relevant to the FIPS provider Fixes #12984 Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12997) ----------------------------------------------------------------------- Summary of changes: crypto/threads_pthread.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c index 936aa7f0c7..a2735332b8 100644 --- a/crypto/threads_pthread.c +++ b/crypto/threads_pthread.c @@ -195,8 +195,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) } # ifndef FIPS_MODULE -/* TODO(3.0): No fork protection in FIPS module yet! */ - # ifdef OPENSSL_SYS_UNIX static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT;