summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2019-06-30 17:16:28 -0400
committerJay Satiro <raysatiro@yahoo.com>2019-06-30 17:16:28 -0400
commit3609ab3147b11118319da4584a0c72f638697838 (patch)
tree1a90292c0c7eae0b632736e44f2dd1c591e04a0e
parent44b5468e8eeae889c5f7c8d6f457c6fa6c2c737d (diff)
downloadcurl-3609ab3147b11118319da4584a0c72f638697838.tar.gz
docs: Fix links to OpenSSL docs
OpenSSL changed their manual locations and does not redirect to the new locations. Bug: https://curl.haxx.se/mail/lib-2019-06/0056.html Reported-by: Daniel Stenberg
-rw-r--r--docs/examples/threaded-ssl.c2
-rw-r--r--docs/libcurl/libcurl-thread.39
-rw-r--r--lib/vtls/openssl.c2
3 files changed, 6 insertions, 7 deletions
diff --git a/docs/examples/threaded-ssl.c b/docs/examples/threaded-ssl.c
index 522f8c49a..f6083ab3d 100644
--- a/docs/examples/threaded-ssl.c
+++ b/docs/examples/threaded-ssl.c
@@ -29,7 +29,7 @@
* (libgcrypt) so far.
*
* OpenSSL docs for this:
- * https://www.openssl.org/docs/crypto/threads.html
+ * https://www.openssl.org/docs/man1.0.2/man3/CRYPTO_num_locks.html
* gcrypt docs for this:
* https://gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
*/
diff --git a/docs/libcurl/libcurl-thread.3 b/docs/libcurl/libcurl-thread.3
index ae1e387be..796a5bb59 100644
--- a/docs/libcurl/libcurl-thread.3
+++ b/docs/libcurl/libcurl-thread.3
@@ -41,14 +41,15 @@ then of course using the underlying SSL library multi-threaded and those libs
might have their own requirements on this issue. You may need to provide one
or two functions to allow it to function properly:
.IP OpenSSL
-OpenSSL 1.1.0 "can be safely used in multi-threaded applications provided that
-support for the underlying OS threading API is built-in."
+OpenSSL 1.1.0+ "can be safely used in multi-threaded applications provided that
+support for the underlying OS threading API is built-in." In that case the
+engine is used by libcurl in a way that is fully thread-safe.
-https://www.openssl.org/docs/manmaster/crypto/threads.html#DESCRIPTION
+https://www.openssl.org/docs/man1.1.0/man3/CRYPTO_THREAD_run_once.html#DESCRIPTION
OpenSSL <= 1.0.2 the user must set callbacks.
-https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
+https://www.openssl.org/docs/man1.0.2/man3/CRYPTO_set_locking_callback.html#DESCRIPTION
https://curl.haxx.se/libcurl/c/opensslthreadlock.html
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 3cdcbfeb9..1d2ec04ed 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3280,7 +3280,6 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, X509* cert,
if(len1 < 1)
break; /* failed */
- /* https://www.openssl.org/docs/crypto/buffer.html */
buff1 = temp = malloc(len1);
if(!buff1)
break; /* failed */
@@ -3302,7 +3301,6 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, X509* cert,
result = Curl_pin_peer_pubkey(data, pinnedpubkey, buff1, len1);
} while(0);
- /* https://www.openssl.org/docs/crypto/buffer.html */
if(buff1)
free(buff1);