Correct the FAQ and the threads man page re: CRYPTO_THREADID changes.

diff --git a/FAQ b/FAQ
index fb997b6fbe864aaa6bcc1711a10f01e27f591feb..139e17b4a92e4e262bf09adfa7d21f7a8984f040 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -717,8 +717,10 @@ file.
 
 Multi-threaded applications must provide two callback functions to
 OpenSSL by calling CRYPTO_set_locking_callback() and
-CRYPTO_set_id_callback().  This is described in the threads(3)
-manpage.
+CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
+including 0.9.8[abc...]. As of version 0.9.9, CRYPTO_set_id_callback()
+and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
+and friends. This is described in the threads(3) manpage.
 
 * I've compiled a program under Windows and it crashes: why?
 

diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod
index e6266a1ec64f62f0b8f3a66f1804593961ef5e73..a1e44311219a7bc93811aa703975ab68c3d5635d 100644 (file)
--- a/doc/crypto/threads.pod
+++ b/doc/crypto/threads.pod
@@ -194,7 +194,7 @@ Solaris, Irix and Win32.
 
 =head1 HISTORY
 
-CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are
+CRYPTO_set_locking_callback() is
 available in all versions of SSLeay and OpenSSL.
 CRYPTO_num_locks() was added in OpenSSL 0.9.4.
 All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.