[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 59/63: ssl: Update outdated "openssl-only" comments
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 59/63: ssl: Update outdated "openssl-only" comments for supported backends |
Date: |
Fri, 07 Jun 2019 18:37:21 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 660603141c5a64b278ddde49de3b7bb931616564
Author: Frank Gevaerts <address@hidden>
AuthorDate: Tue Jun 4 13:51:12 2019 +0200
ssl: Update outdated "openssl-only" comments for supported backends
These are for features that used to be openssl-only but were expanded
over time to support other SSL backends.
Closes #3985
---
include/curl/curl.h | 25 ++++++++++++++-----------
lib/urldata.h | 5 +++--
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index d83b21798..e7f812dac 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -209,16 +209,17 @@ struct curl_httppost {
set. Added in 7.46.0 */
};
-/* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
- deprecated but was the only choice up until 7.31.0 */
+/* This is the CURLOPT_PROGRESSFUNCTION callback prototype. It is now
+ considered deprecated but was the only choice up until 7.31.0 */
typedef int (*curl_progress_callback)(void *clientp,
double dltotal,
double dlnow,
double ultotal,
double ulnow);
-/* This is the CURLOPT_XFERINFOFUNCTION callback proto. It was introduced in
- 7.32.0, it avoids floating point and provides more detailed information. */
+/* This is the CURLOPT_XFERINFOFUNCTION callback prototype. It was introduced
+ in 7.32.0, avoids the use of floating point numbers and provides more
+ detailed information. */
typedef int (*curl_xferinfo_callback)(void *clientp,
curl_off_t dltotal,
curl_off_t dlnow,
@@ -685,8 +686,10 @@ typedef enum {
typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length);
typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl, /* easy handle */
- void *ssl_ctx, /* actually an
- OpenSSL SSL_CTX */
+ void *ssl_ctx, /* actually an OpenSSL
+ or WolfSSL SSL_CTX,
+ or an mbedTLS
+ mbedtls_ssl_config */
void *userptr);
typedef enum {
@@ -1314,9 +1317,9 @@ typedef enum {
Note that setting multiple bits may cause extra network round-trips. */
CINIT(HTTPAUTH, LONG, 107),
- /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
- in second argument. The function must be matching the
- curl_ssl_ctx_callback proto. */
+ /* Set the ssl context callback function, currently only for OpenSSL or
+ WolfSSL ssl_ctx, or mbedTLS mbedtls_ssl_config in the second argument.
+ The function must match the curl_ssl_ctx_callback prototype. */
CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
/* Set the userdata for the ssl context callback function's third
@@ -2514,8 +2517,8 @@ CURL_EXTERN void curl_slist_free_all(struct curl_slist *);
*/
CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
-/* info about the certificate chain, only for OpenSSL builds. Asked
- for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
+/* info about the certificate chain, only for OpenSSL, GnuTLS, Schannel, NSS
+ and GSKit builds. Asked for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
struct curl_certinfo {
int num_of_certs; /* number of certificates with information */
struct curl_slist **certinfo; /* for each index in this array, there's a
diff --git a/lib/urldata.h b/lib/urldata.h
index 42fb82fdd..f8ba591dd 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1081,8 +1081,9 @@ struct PureInfo {
const char *conn_scheme;
unsigned int conn_protocol;
struct curl_certinfo certs; /* info about the certs, only populated in
- OpenSSL builds. Asked for with
- CURLOPT_CERTINFO / CURLINFO_CERTINFO */
+ OpenSSL, GnuTLS, Schannel, NSS and GSKit
+ builds. Asked for with CURLOPT_CERTINFO
+ / CURLINFO_CERTINFO */
bit timecond:1; /* set to TRUE if the time condition didn't match, which
thus made the document NOT get fetched */
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [gnurl] 47/63: RELEASE-NOTES: synced, (continued)
- [GNUnet-SVN] [gnurl] 47/63: RELEASE-NOTES: synced, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 44/63: system_win32: fix function prototype, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 50/63: tls13-docs: mention it is only for OpenSSL >= 1.1.1, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 30/63: RELEASE-NOTES: synced, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 55/63: tests/server/.gitignore: Add socksd to the ignore list, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 57/63: tool_parsecfg: Use correct return type for GetModuleFileName(), gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 54/63: tool_parsecfg: Fix control flow issue (DEADCODE), gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 60/63: THANKS: new contributors from 7.65.1, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 61/63: RELEASE-NOTES: 7.65.1, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 63/63: Merge changes to doc., gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 59/63: ssl: Update outdated "openssl-only" comments for supported backends,
gnunet <=
- [GNUnet-SVN] [gnurl] 62/63: Merge tag 'curl-7_65_1' of https://github.com/curl/curl, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 49/63: dump-header.d: spell out that no headers == empty file [ci skip], gnunet, 2019/06/07