ssh: define USE_SSH if SSH is enabled (any backend)

Closes #3846

diff --git a/lib/curl_path.c b/lib/curl_path.c
index ad386e74333518bb001986cb7ac91a1f563d7c9c..85dddcef1b4a9446ed7122157184d01d97b1c1cf 100644 (file)
--- a/lib/curl_path.c
+++ b/lib/curl_path.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+#if defined(USE_SSH)
 
 #include <curl/curl.h>
 #include "curl_memory.h"

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 4c3a17359651adc913b7f855c25bef2886f9eb65..e5b5c863bcf66c49f42858bc7794dc53364647c0 100644 (file)
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -686,6 +686,10 @@ int netware_init(void);
 #error "No longer supported. Set CURLOPT_CAINFO at runtime instead."
 #endif
 
+#if defined(USE_LIBSSH2) || defined(USE_LIBSSH) || defined(USE_WOLFSSH)
+#define USE_SSH
+#endif
+
 /*
  * Provide a mechanism to silence picky compilers, such as gcc 4.6+.
  * Parameters should of course normally not be unused, but for example when

diff --git a/lib/setopt.c b/lib/setopt.c
index da9ed3bb10e218c40803d0ad9d40575cc9b28e2e..6352f486aa04024b6dae0d7900d063377d0fda2d 100644 (file)
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -2217,7 +2217,7 @@ static CURLcode vsetopt(struct Curl_easy *data, CURLoption option,
     data->set.proxy_ssl.primary.sessionid = data->set.ssl.primary.sessionid;
     break;
 
-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+#ifdef USE_SSH
     /* we only include SSH options if explicitly built to support SSH */
   case CURLOPT_SSH_AUTH_TYPES:
     data->set.ssh_auth_types = va_arg(param, long);
@@ -2267,7 +2267,7 @@ static CURLcode vsetopt(struct Curl_easy *data, CURLoption option,
      */
     data->set.ssh_keyfunc_userp = va_arg(param, void *);
     break;
-#endif /* USE_LIBSSH2 */
+#endif /* USE_SSH */
 
   case CURLOPT_HTTP_TRANSFER_DECODING:
     /*

diff --git a/lib/url.c b/lib/url.c
index 5b3ce11f24c896351bf8eaf3310f95eb2970e068..cd775af4a59a7fa4a82406a3276d8e262c79e436 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -186,11 +186,11 @@ static const struct Curl_handler * const protocols[] = {
   &Curl_handler_tftp,
 #endif
 
-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+#if defined(USE_SSH)
   &Curl_handler_scp,
 #endif
 
-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+#if defined(USE_SSH)
   &Curl_handler_sftp,
 #endif
 

diff --git a/lib/urldata.h b/lib/urldata.h
index 344cc472e5568edda889ec53b5babd90b29e3bac..608b675dfbd1a230e1d6b946e083332900c85af9 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1454,7 +1454,7 @@ enum dupstring {
   STRING_RTSP_SESSION_ID, /* Session ID to use */
   STRING_RTSP_STREAM_URI, /* Stream URI for this request */
   STRING_RTSP_TRANSPORT,  /* Transport for this session */
-#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+#ifdef USE_SSH
   STRING_SSH_PRIVATE_KEY, /* path to the private key file for auth */
   STRING_SSH_PUBLIC_KEY,  /* path to the public key file for auth */
   STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ascii hex */

diff --git a/lib/version.c b/lib/version.c
index 4c885dc33ba0179d93f6a2736c01eb4c76afac4f..87ebe0bc7a7b218a69c3b2c4c26273a88ffb7c63 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -274,7 +274,7 @@ static const char * const protocols[] = {
 #ifndef CURL_DISABLE_RTSP
   "rtsp",
 #endif
-#if defined(USE_LIBSSH) || defined(USE_LIBSSH2)
+#if defined(USE_SSH)
   "scp",
   "sftp",
 #endif
@@ -390,7 +390,7 @@ static curl_version_info_data version_info = {
 curl_version_info_data *curl_version_info(CURLversion stamp)
 {
   static bool initialized;
-#if defined(USE_LIBSSH) || defined(USE_LIBSSH2)
+#if defined(USE_SSH)
   static char ssh_buffer[80];
 #endif
 #ifdef USE_SSL