Commit a634f644 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

James Housley did lots of work and introduced SFTP downloads.

parent bcd8a3b2

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


                                  Changelog



Daniel (24 November 2006)

- James Housley did lots of work and introduced SFTP downloads.



Daniel (13 November 2006)

- Ron in bug #1595348 (http://curl.haxx.se/bug/view.cgi?id=1595348) pointed

  out a stack overwrite (and the corresponding fix) on 64bit Windows when

RELEASE-NOTES

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Curl and libcurl 7.16.1 


This release includes the following changes:

 

 o Support for SCP added

 o Support for SCP and SFTP were added



This release includes the following bugfixes:

lib/sendf.c

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ CURLcode Curl_write(struct connectdata *conn, 
#ifdef USE_LIBSSH2

  else if (conn->protocol & PROT_SCP)

    bytes_written = Curl_scp_send(conn, num, mem, len);

  else if (conn->protocol & PROT_SFTP)

    bytes_written = Curl_sftp_send(conn, num, mem, len);

#endif /* !USE_LIBSSH2 */

  else if(conn->sec_complete)

    /* only TRUE if krb4 enabled */
@@ -522,6 +524,9 @@ int Curl_read(struct connectdata *conn, /* connection data */ 
    /* TODO: return CURLE_OK also for nread <= 0

             read failures and timeouts ? */

  }

  else if (conn->protocol & PROT_SFTP) {

    nread = Curl_sftp_recv(conn, num, conn->master_buffer, bytesfromsocket);

  }

#endif /* !USE_LIBSSH2 */

  else {

    if(conn->sec_complete)

lib/ssh.c

+560 −107

File changed.

Preview size limit exceeded, changes collapsed.

lib/ssh.h

+17 −8
Original line number Diff line number Diff line 
#ifndef __SFTP_H

#define __SFTP_H

#ifndef __SSH_H

#define __SSH_H



/***************************************************************************

 *                                  _   _ ____  _
@@ -26,15 +26,24 @@ 


#ifdef USE_LIBSSH2



CURLcode Curl_scp_connect(struct connectdata *conn, bool *done);

CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done);



CURLcode Curl_scp_do(struct connectdata *conn, bool *done);

CURLcode Curl_scp_done(struct connectdata *conn, CURLcode);



int Curl_scp_send(struct connectdata *conn, int sockindex,

ssize_t Curl_scp_send(struct connectdata *conn, int sockindex,

                      void *mem, size_t len);

int Curl_scp_recv(struct connectdata *conn, int sockindex,

ssize_t Curl_scp_recv(struct connectdata *conn, int sockindex,

                      char *mem, size_t len);



#endif

CURLcode Curl_sftp_do(struct connectdata *conn, bool *done);

CURLcode Curl_sftp_done(struct connectdata *conn, CURLcode);



ssize_t Curl_sftp_send(struct connectdata *conn, int sockindex,

                       void *mem, size_t len);

ssize_t Curl_sftp_recv(struct connectdata *conn, int sockindex,

                       char *mem, size_t len);



#endif /* USE_LIBSSH2 */



#endif /* __SSH_H */