diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2014-08-03 10:40:36 +0200 | 
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2014-08-03 10:43:31 +0200 | 
| commit | cac1dd58a874165f6df35d2381f8582fcf9350e0 (patch) | |
| tree | b8da5a1c0bbb7abead2262ed64b2859ca767e714 | |
| parent | 595f5f0e43b5395881ffb7d3076a9cdd898cfa5d (diff) | |
ssl: provide Curl_ssl_backend even if no SSL library is available
| -rw-r--r-- | lib/vtls/vtls.c | 10 | ||||
| -rw-r--r-- | lib/vtls/vtls.h | 3 | 
2 files changed, 7 insertions, 6 deletions
| diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index e418955bd..88511b8bb 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -249,6 +249,11 @@ unsigned int Curl_rand(struct SessionHandle *data)    return (r << 16) | ((r >> 16) & 0xFFFF);  } +int Curl_ssl_backend(void) +{ +  return (int)CURL_SSL_BACKEND; +} +  #ifdef USE_SSL  /* "global" init done? */ @@ -697,9 +702,4 @@ void Curl_ssl_md5sum(unsigned char *tmp, /* input */  }  #endif -int Curl_ssl_backend(void) -{ -  return (int)CURL_SSL_BACKEND; -} -  #endif /* USE_SSL */ diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index e3fa20b7a..e21fdef94 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -39,6 +39,8 @@ void Curl_free_ssl_config(struct ssl_config_data* sslc);  unsigned int Curl_rand(struct SessionHandle *); +int Curl_ssl_backend(void); +  #ifdef USE_SSL  int Curl_ssl_init(void);  void Curl_ssl_cleanup(void); @@ -96,7 +98,6 @@ void Curl_ssl_md5sum(unsigned char *tmp, /* input */                       size_t tmplen,                       unsigned char *md5sum, /* output */                       size_t md5len); -int Curl_ssl_backend(void);  #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */ | 
