Commit a7d88942 authored by Yang Tse's avatar Yang Tse
Browse files

ssh.c: revert needless commit 7b7c4587

parent 08a5a9b6

RELEASE-NOTES

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ This release includes the following bugfixes: 
 o RTSP: GET_PARAMETER requests have a body

 o fixed several memory leaks in OOM situations

 o bad expire(0) caused multi_socket API to hang

 o libssh2: use calloc as alloc function for older libssh2

 o Avoid ftruncate() static define with mingw64

 o mk-ca-bundle.pl: ignore untrusted certs

lib/ssh.c

+3 −57
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 
/* Local functions: */

static const char *sftp_libssh2_strerror(unsigned long err);

static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc);

static LIBSSH2_ALLOC_FUNC(my_libssh2_calloc);

static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc);

static LIBSSH2_FREE_FUNC(my_libssh2_free);
@@ -199,44 +198,6 @@ const struct Curl_handler Curl_handler_sftp = { 
};





static void

libssh2_version_components(int *major, int *minor, int *patch)

{

  char buff[80];

  char *ptr = &buff[0];

  *major = 0;

  *minor = 0;

  *patch = 0;

#ifdef HAVE_LIBSSH2_VERSION

  /* run-time version */

  snprintf(buff, sizeof(buff), "%s", libssh2_version(0));

#else

  /* compile-time version */

  snprintf(buff, sizeof(buff), "%s", LIBSSH2_VERSION);

#endif

  while(ptr && ISDIGIT(*ptr)) {

    *major *= 10;

    *major += *ptr - '0';

    ptr++;

  }

  if(*ptr == '.') {

    ptr++;

    while(ptr && ISDIGIT(*ptr)) {

      *minor *= 10;

      *minor += *ptr - '0';

      ptr++;

    }

    if(*ptr == '.') {

      ptr++;

      while(ptr && ISDIGIT(*ptr)) {

        *patch *= 10;

        *patch += *ptr - '0';

        ptr++;

      }

    }

  }

}



static void

kbd_callback(const char *name, int name_len, const char *instruction,

             int instruction_len, int num_prompts,
@@ -344,12 +305,6 @@ static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc) 
  return malloc(count);

}



static LIBSSH2_ALLOC_FUNC(my_libssh2_calloc)

{

  (void)abstract; /* arg not used */

  return calloc(1, count);

}



static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc)

{

  (void)abstract; /* arg not used */
@@ -2670,9 +2625,6 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) 
#endif

  struct ssh_conn *ssh;

  CURLcode result;

  int major = 0;

  int minor = 0;

  int patch = 0;

  struct SessionHandle *data = conn->data;



  /* We default to persistent connections. We set this already in this connect
@@ -2707,12 +2659,6 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) 
  sock = conn->sock[FIRSTSOCKET];

#endif /* CURL_LIBSSH2_DEBUG */



  libssh2_version_components(&major, &minor, &patch);

  if((major < 1) || ((major == 1) && (minor < 3)))

    ssh->ssh_session = libssh2_session_init_ex(my_libssh2_calloc,

                                               my_libssh2_free,

                                               my_libssh2_realloc, conn);

  else

  ssh->ssh_session = libssh2_session_init_ex(my_libssh2_malloc,

                                             my_libssh2_free,

                                             my_libssh2_realloc, conn);