Unverified Commit b8e0fe19 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

... it just returns error:

Bug: https://github.com/curl/curl/commit/1328f69d53f2f2e937696ea954c480412b018451#commitcomment-24470367
Reported-by: Marcel Raad

Closes #1906
parent ee56fdb6

docs/libcurl/curl_global_sslset.3

+5 −2
Original line number Diff line number Diff line
@@ -85,10 +85,13 @@ support for choosing SSL backends at runtime. 
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

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

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"

.BR curl_global_init "(3), "

.BR libcurl "(3) "

include/curl/curl.h

+2 −1
Original line number Diff line number Diff line
@@ -2370,7 +2370,8 @@ typedef struct { 
typedef enum {

  CURLSSLSET_OK = 0,

  CURLSSLSET_UNKNOWN_BACKEND,

  CURLSSLSET_TOO_LATE

  CURLSSLSET_TOO_LATE,

  CURLSSLSET_NO_BACKENDS /* libcurl was built without any SSL support */

} CURLsslset;



CURL_EXTERN CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,

lib/vtls/vtls.c

+11 −1
Original line number Diff line number Diff line
@@ -1296,4 +1296,14 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, 
  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 */