Skip to content

Commit 6606031

Browse files
gevaertscaptain-caveman2k
authored andcommitted
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 curl#3985
1 parent be527af commit 6606031

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

include/curl/curl.h

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,17 @@ struct curl_httppost {
209209
set. Added in 7.46.0 */
210210
};
211211

212-
/* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered
213-
deprecated but was the only choice up until 7.31.0 */
212+
/* This is the CURLOPT_PROGRESSFUNCTION callback prototype. It is now
213+
considered deprecated but was the only choice up until 7.31.0 */
214214
typedef int (*curl_progress_callback)(void *clientp,
215215
double dltotal,
216216
double dlnow,
217217
double ultotal,
218218
double ulnow);
219219

220-
/* This is the CURLOPT_XFERINFOFUNCTION callback proto. It was introduced in
221-
7.32.0, it avoids floating point and provides more detailed information. */
220+
/* This is the CURLOPT_XFERINFOFUNCTION callback prototype. It was introduced
221+
in 7.32.0, avoids the use of floating point numbers and provides more
222+
detailed information. */
222223
typedef int (*curl_xferinfo_callback)(void *clientp,
223224
curl_off_t dltotal,
224225
curl_off_t dlnow,
@@ -685,8 +686,10 @@ typedef enum {
685686
typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length);
686687

687688
typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl, /* easy handle */
688-
void *ssl_ctx, /* actually an
689-
OpenSSL SSL_CTX */
689+
void *ssl_ctx, /* actually an OpenSSL
690+
or WolfSSL SSL_CTX,
691+
or an mbedTLS
692+
mbedtls_ssl_config */
690693
void *userptr);
691694

692695
typedef enum {
@@ -1314,9 +1317,9 @@ typedef enum {
13141317
Note that setting multiple bits may cause extra network round-trips. */
13151318
CINIT(HTTPAUTH, LONG, 107),
13161319

1317-
/* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
1318-
in second argument. The function must be matching the
1319-
curl_ssl_ctx_callback proto. */
1320+
/* Set the ssl context callback function, currently only for OpenSSL or
1321+
WolfSSL ssl_ctx, or mbedTLS mbedtls_ssl_config in the second argument.
1322+
The function must match the curl_ssl_ctx_callback prototype. */
13201323
CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
13211324

13221325
/* 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 *);
25142517
*/
25152518
CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
25162519

2517-
/* info about the certificate chain, only for OpenSSL builds. Asked
2518-
for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
2520+
/* info about the certificate chain, only for OpenSSL, GnuTLS, Schannel, NSS
2521+
and GSKit builds. Asked for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */
25192522
struct curl_certinfo {
25202523
int num_of_certs; /* number of certificates with information */
25212524
struct curl_slist **certinfo; /* for each index in this array, there's a

lib/urldata.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,8 +1081,9 @@ struct PureInfo {
10811081
const char *conn_scheme;
10821082
unsigned int conn_protocol;
10831083
struct curl_certinfo certs; /* info about the certs, only populated in
1084-
OpenSSL builds. Asked for with
1085-
CURLOPT_CERTINFO / CURLINFO_CERTINFO */
1084+
OpenSSL, GnuTLS, Schannel, NSS and GSKit
1085+
builds. Asked for with CURLOPT_CERTINFO
1086+
/ CURLINFO_CERTINFO */
10861087

10871088
bit timecond:1; /* set to TRUE if the time condition didn't match, which
10881089
thus made the document NOT get fetched */

0 commit comments

Comments
 (0)