mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
parent
c23b8e827c
commit
d37b0936d1
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
#include "curl_setup.h"
|
#include "curl_setup.h"
|
||||||
|
|
||||||
#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
|
#if defined(USE_SSH)
|
||||||
|
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include "curl_memory.h"
|
#include "curl_memory.h"
|
||||||
|
@ -686,6 +686,10 @@ int netware_init(void);
|
|||||||
#error "No longer supported. Set CURLOPT_CAINFO at runtime instead."
|
#error "No longer supported. Set CURLOPT_CAINFO at runtime instead."
|
||||||
#endif
|
#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+.
|
* Provide a mechanism to silence picky compilers, such as gcc 4.6+.
|
||||||
* Parameters should of course normally not be unused, but for example when
|
* Parameters should of course normally not be unused, but for example when
|
||||||
|
@ -2217,7 +2217,7 @@ static CURLcode vsetopt(struct Curl_easy *data, CURLoption option,
|
|||||||
data->set.proxy_ssl.primary.sessionid = data->set.ssl.primary.sessionid;
|
data->set.proxy_ssl.primary.sessionid = data->set.ssl.primary.sessionid;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
|
#ifdef USE_SSH
|
||||||
/* we only include SSH options if explicitly built to support SSH */
|
/* we only include SSH options if explicitly built to support SSH */
|
||||||
case CURLOPT_SSH_AUTH_TYPES:
|
case CURLOPT_SSH_AUTH_TYPES:
|
||||||
data->set.ssh_auth_types = va_arg(param, long);
|
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 *);
|
data->set.ssh_keyfunc_userp = va_arg(param, void *);
|
||||||
break;
|
break;
|
||||||
#endif /* USE_LIBSSH2 */
|
#endif /* USE_SSH */
|
||||||
|
|
||||||
case CURLOPT_HTTP_TRANSFER_DECODING:
|
case CURLOPT_HTTP_TRANSFER_DECODING:
|
||||||
/*
|
/*
|
||||||
|
@ -186,11 +186,11 @@ static const struct Curl_handler * const protocols[] = {
|
|||||||
&Curl_handler_tftp,
|
&Curl_handler_tftp,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
|
#if defined(USE_SSH)
|
||||||
&Curl_handler_scp,
|
&Curl_handler_scp,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
|
#if defined(USE_SSH)
|
||||||
&Curl_handler_sftp,
|
&Curl_handler_sftp,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1454,7 +1454,7 @@ enum dupstring {
|
|||||||
STRING_RTSP_SESSION_ID, /* Session ID to use */
|
STRING_RTSP_SESSION_ID, /* Session ID to use */
|
||||||
STRING_RTSP_STREAM_URI, /* Stream URI for this request */
|
STRING_RTSP_STREAM_URI, /* Stream URI for this request */
|
||||||
STRING_RTSP_TRANSPORT, /* Transport for this session */
|
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_PRIVATE_KEY, /* path to the private key file for auth */
|
||||||
STRING_SSH_PUBLIC_KEY, /* path to the public 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 */
|
STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ascii hex */
|
||||||
|
@ -274,7 +274,7 @@ static const char * const protocols[] = {
|
|||||||
#ifndef CURL_DISABLE_RTSP
|
#ifndef CURL_DISABLE_RTSP
|
||||||
"rtsp",
|
"rtsp",
|
||||||
#endif
|
#endif
|
||||||
#if defined(USE_LIBSSH) || defined(USE_LIBSSH2)
|
#if defined(USE_SSH)
|
||||||
"scp",
|
"scp",
|
||||||
"sftp",
|
"sftp",
|
||||||
#endif
|
#endif
|
||||||
@ -390,7 +390,7 @@ static curl_version_info_data version_info = {
|
|||||||
curl_version_info_data *curl_version_info(CURLversion stamp)
|
curl_version_info_data *curl_version_info(CURLversion stamp)
|
||||||
{
|
{
|
||||||
static bool initialized;
|
static bool initialized;
|
||||||
#if defined(USE_LIBSSH) || defined(USE_LIBSSH2)
|
#if defined(USE_SSH)
|
||||||
static char ssh_buffer[80];
|
static char ssh_buffer[80];
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_SSL
|
#ifdef USE_SSL
|
||||||
|
Loading…
Reference in New Issue
Block a user