From: Dan Fandrich <dan@coneharvesters.com>
Date: Sun, 3 Aug 2014 08:40:36 +0000 (+0200)
Subject: ssl: provide Curl_ssl_backend even if no SSL library is available
X-Git-Tag: curl-7_38_0~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cac1dd58a874165f6df35d2381f8582fcf9350e0;p=thirdparty%2Fcurl.git

ssl: provide Curl_ssl_backend even if no SSL library is available
---

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index e418955bd3..88511b8bb6 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 e3fa20b7ae..e21fdef943 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 */