[openssl-commits] [web] master update

[Matt Caswell]

The branch master has been updated
       via  fa107776f99dc0ee563cb9c62373902ba8677806 (commit)
      from  8dee561ae8bd80f8683a48fd649787f56ae24905 (commit)


- Log -----------------------------------------------------------------
commit fa107776f99dc0ee563cb9c62373902ba8677806
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Jun 13 14:13:21 2017 +1000

    Rework the threading FAQ question so it corresponds to current behaviour.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9)

-----------------------------------------------------------------------

Summary of changes:
 docs/faq-3-prog.txt | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/faq-3-prog.txt b/docs/faq-3-prog.txt
index f52c98f..e86727b 100644
--- a/docs/faq-3-prog.txt
+++ b/docs/faq-3-prog.txt
@@ -2,15 +2,18 @@ Programming with OpenSSL
 
 * Is OpenSSL thread-safe?
 
-Provided an application sets up the thread callback functions, the
-answer is yes. There are limitations; for example, an SSL connection
+Yes but with some limitations; for example, an SSL connection
 cannot be used concurrently by multiple threads.  This is true for
 most OpenSSL objects.
 
-To do this, your application must call CRYPTO_set_locking_callback(3)
-and one of the CRYPTO_THREADID_set... API's.  See the OpenSSL threads
-manpage for details and "note on multi-threading" in the INSTALL file in
-the source distribution.
+For version 1.1.0 and later, there is nothing further you need do.
+
+For earlier versions than 1.1.0, it is necessary for your
+application to set up the thread callback functions.  To do this,
+your application must call CRYPTO_set_locking_callback(3) and one of
+the CRYPTO_THREADID_set... API's.  See the OpenSSL threads manpage for
+details and "note on multi-threading" in the INSTALL file in the source
+distribution.
 
 * I've compiled a program under Windows and it crashes: why?