Unverified Commit d0394de1 authored by Christian Schmitz's avatar Christian Schmitz Committed by Daniel Stenberg
Browse files

curl_global_sslset: always provide available backends 

Closes #2499
parent 0a3589cc

docs/libcurl/curl_global_sslset.3

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms
@@ -64,6 +64,9 @@ CURLSSLSET_UNKNOWN_BACKEND and set the \fIavail\fP pointer to the 
NULL-terminated list of available backends. The available backends are those

that this particular build of libcurl supports.



Since libcurl 7.60.0, the \fIavail\fP pointer will always be set to the list

of alternatives if non-NULL.



Upon success, the function returns CURLSSLSET_OK.



If the specified SSL backend is not available, the function returns

lib/vtls/vtls.c

+3 −2
Original line number Diff line number Diff line
@@ -1304,6 +1304,9 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, 
{

  int i;



  if(avail)

    *avail = (const curl_ssl_backend **)&available_backends;



  if(Curl_ssl != &Curl_ssl_multi)

    return id == Curl_ssl->info.id ? CURLSSLSET_OK : CURLSSLSET_TOO_LATE;
@@ -1315,8 +1318,6 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, 
    }

  }



  if(avail)

    *avail = (const curl_ssl_backend **)&available_backends;

  return CURLSSLSET_UNKNOWN_BACKEND;

}