aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2008-08-06 16:41:50 +0000
committerGeoff Thorpe <geoff@openssl.org>2008-08-06 16:41:50 +0000
commitab9c689ad387fcd209017fe45985b1938a0ee0df (patch)
treea325b3f4931d3bd43fd0d84434922d198a16588f
parent4c3296960de32e5abfbb8f4703a2ce624d82669f (diff)
downloadopenssl-ab9c689ad387fcd209017fe45985b1938a0ee0df.tar.gz
Correct the FAQ and the threads man page re: CRYPTO_THREADID changes.
-rw-r--r--FAQ6
-rw-r--r--doc/crypto/threads.pod2
2 files changed, 5 insertions, 3 deletions
diff --git a/FAQ b/FAQ
index fb997b6fbe..139e17b4a9 100644
--- 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 e6266a1ec6..a1e4431121 100644
--- 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.