moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

vtls: provide curl_global_sslset() even in non-SSL builds 

... it just returns error:

Bug: 1328f69d53 (commitcomment-24470367)
Reported-by: Marcel Raad

Closes #1906
This commit is contained in:
Daniel Stenberg 2017-09-21 23:30:48 +02:00
parent ee56fdb691
commit b8e0fe19ec
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/libcurl/curl_global_sslset.3
View File

@ -85,10 +85,13 @@ support for choosing SSL backends at runtime.
If this function returns CURLSSLSET_OK, the backend was successfully selected. If this function returns CURLSSLSET_OK, the backend was successfully selected.
If the chosen backend is unknown (or support for the chosed backend has not If the chosen backend is unknown (or support for the chosed backend has not
been compiled into libcurl), the function returns CURLSSLSET_UNKNOWN_BACKEND. been compiled into libcurl), the function returns \fICURLSSLSET_UNKNOWN_BACKEND\fP.
If the backend had been configured previously, or if \fIcurl_global_init(3)\fP If the backend had been configured previously, or if \fIcurl_global_init(3)\fP
has already been called, the function returns CURLSSLSET_TOO_LATE. has already been called, the function returns \fICURLSSLSET_TOO_LATE\fP.
If this libcurl was built completely without SSL support, with no backends at
all, this function returns \fICURLSSLSET_NO_BACKENDS\fP.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR curl_global_init "(3), " .BR curl_global_init "(3), "
.BR libcurl "(3) " .BR libcurl "(3) "

3
include/curl/curl.h
View File

@ -2370,7 +2370,8 @@ typedef struct {
typedef enum { typedef enum {
CURLSSLSET_OK = 0, CURLSSLSET_OK = 0,
CURLSSLSET_UNKNOWN_BACKEND, CURLSSLSET_UNKNOWN_BACKEND,
CURLSSLSET_TOO_LATE CURLSSLSET_TOO_LATE,
CURLSSLSET_NO_BACKENDS /* libcurl was built without any SSL support */
} CURLsslset; } CURLsslset;
CURL_EXTERN CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, CURL_EXTERN CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,

12
lib/vtls/vtls.c
View File

@ -1296,4 +1296,14 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
return CURLSSLSET_UNKNOWN_BACKEND; return CURLSSLSET_UNKNOWN_BACKEND;
} }
#endif /* USE_SSL */ #else /* USE_SSL */
CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
const curl_ssl_backend ***avail)
{
(void)id;
(void)name;
(void)avail;
return CURLSSLSET_NO_BACKENDS;
}
#endif /* !USE_SSL */