libcurl: update to 8.1.2

3 files changed, 48 insertions, 28 deletions

diff --git a/libs/libcurl/src/vssh/libssh.c b/libs/libcurl/src/vssh/libssh.c
index 3fdec459d9..aae6f5aa54 100644
--- a/libs/libcurl/src/vssh/libssh.c
+++ b/libs/libcurl/src/vssh/libssh.c
@@ -576,7 +576,7 @@ cleanup:
     rc = SSH_ERROR;                                             \

   } while(0)

 

-#define MOVE_TO_LAST_AUTH do {                          \

+#define MOVE_TO_PASSWD_AUTH do {                        \

     if(sshc->auth_methods & SSH_AUTH_METHOD_PASSWORD) { \

       rc = SSH_OK;                                      \

       state(data, SSH_AUTH_PASS_INIT);                  \

@@ -586,23 +586,23 @@ cleanup:
     }                                                   \

   } while(0)

 

-#define MOVE_TO_TERTIARY_AUTH do {                              \

+#define MOVE_TO_KEY_AUTH do {                                   \

     if(sshc->auth_methods & SSH_AUTH_METHOD_INTERACTIVE) {      \

       rc = SSH_OK;                                              \

       state(data, SSH_AUTH_KEY_INIT);                           \

     }                                                           \

     else {                                                      \

-      MOVE_TO_LAST_AUTH;                                        \

+      MOVE_TO_PASSWD_AUTH;                                      \

     }                                                           \

   } while(0)

 

-#define MOVE_TO_SECONDARY_AUTH do {                             \

+#define MOVE_TO_GSSAPI_AUTH do {                                \

     if(sshc->auth_methods & SSH_AUTH_METHOD_GSSAPI_MIC) {       \

       rc = SSH_OK;                                              \

       state(data, SSH_AUTH_GSSAPI);                             \

     }                                                           \

     else {                                                      \

-      MOVE_TO_TERTIARY_AUTH;                                    \

+      MOVE_TO_KEY_AUTH;                                         \

     }                                                           \

   } while(0)

 

@@ -753,6 +753,16 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         }

 

         sshc->auth_methods = ssh_userauth_list(sshc->ssh_session, NULL);

+        if(sshc->auth_methods)

+          infof(data, "SSH authentication methods available: %s%s%s%s",

+                sshc->auth_methods & SSH_AUTH_METHOD_PUBLICKEY ?

+                "public key, ": "",

+                sshc->auth_methods & SSH_AUTH_METHOD_GSSAPI_MIC ?

+                "GSSAPI, " : "",

+                sshc->auth_methods & SSH_AUTH_METHOD_INTERACTIVE ?

+                "keyboard-interactive, " : "",

+                sshc->auth_methods & SSH_AUTH_METHOD_PASSWORD ?

+                "password": "");

         if(sshc->auth_methods & SSH_AUTH_METHOD_PUBLICKEY) {

           state(data, SSH_AUTH_PKEY_INIT);

           infof(data, "Authentication using SSH public key file");

@@ -775,7 +785,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       }

     case SSH_AUTH_PKEY_INIT:

       if(!(data->set.ssh_auth_types & CURLSSH_AUTH_PUBLICKEY)) {

-        MOVE_TO_SECONDARY_AUTH;

+        MOVE_TO_GSSAPI_AUTH;

         break;

       }

 

@@ -791,7 +801,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
           }

 

           if(rc != SSH_OK) {

-            MOVE_TO_SECONDARY_AUTH;

+            MOVE_TO_GSSAPI_AUTH;

             break;

           }

         }

@@ -826,7 +836,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
           break;

         }

 

-        MOVE_TO_SECONDARY_AUTH;

+        MOVE_TO_GSSAPI_AUTH;

       }

       break;

     case SSH_AUTH_PKEY:

@@ -844,13 +854,13 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       }

       else {

         infof(data, "Failed public key authentication (rc: %d)", rc);

-        MOVE_TO_SECONDARY_AUTH;

+        MOVE_TO_GSSAPI_AUTH;

       }

       break;

 

     case SSH_AUTH_GSSAPI:

       if(!(data->set.ssh_auth_types & CURLSSH_AUTH_GSSAPI)) {

-        MOVE_TO_TERTIARY_AUTH;

+        MOVE_TO_KEY_AUTH;

         break;

       }

 

@@ -868,7 +878,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

 

-      MOVE_TO_TERTIARY_AUTH;

+      MOVE_TO_KEY_AUTH;

       break;

 

     case SSH_AUTH_KEY_INIT:

@@ -876,13 +886,12 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         state(data, SSH_AUTH_KEY);

       }

       else {

-        MOVE_TO_LAST_AUTH;

+        MOVE_TO_PASSWD_AUTH;

       }

       break;

 

     case SSH_AUTH_KEY:

-

-      /* Authentication failed. Continue with keyboard-interactive now. */

+      /* keyboard-interactive authentication */

       rc = myssh_auth_interactive(conn);

       if(rc == SSH_AGAIN) {

         break;

@@ -890,13 +899,15 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       if(rc == SSH_OK) {

         sshc->authed = TRUE;

         infof(data, "completed keyboard interactive authentication");

+        state(data, SSH_AUTH_DONE);

+      }

+      else {

+        MOVE_TO_PASSWD_AUTH;

       }

-      state(data, SSH_AUTH_DONE);

       break;

 

     case SSH_AUTH_PASS_INIT:

       if(!(data->set.ssh_auth_types & CURLSSH_AUTH_PASSWORD)) {

-        /* Host key authentication is intentionally not implemented */

         MOVE_TO_ERROR_STATE(CURLE_LOGIN_DENIED);

         break;

       }

@@ -1209,7 +1220,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
     }

 

     case SSH_SFTP_TRANS_INIT:

-      if(data->set.upload)

+      if(data->state.upload)

         state(data, SSH_SFTP_UPLOAD_INIT);

       else {

         if(protop->path[strlen(protop->path)-1] == '/')

@@ -1597,7 +1608,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         MOVE_TO_SFTP_CLOSE_STATE();

         break;

       }

-

+      sftp_file_set_nonblocking(sshc->sftp_file);

       state(data, SSH_SFTP_DOWNLOAD_STAT);

       break;

 

@@ -1802,7 +1813,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
       /* Functions from the SCP subsystem cannot handle/return SSH_AGAIN */

       ssh_set_blocking(sshc->ssh_session, 1);

 

-      if(data->set.upload) {

+      if(data->state.upload) {

         if(data->state.infilesize < 0) {

           failf(data, "SCP requires a known file size for upload");

           sshc->actualcode = CURLE_UPLOAD_FAILED;

@@ -1907,7 +1918,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

     case SSH_SCP_DONE:

-      if(data->set.upload)

+      if(data->state.upload)

         state(data, SSH_SCP_SEND_EOF);

       else

         state(data, SSH_SCP_CHANNEL_FREE);

diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c
index edc1c8f158..115d90de89 100644
--- a/libs/libcurl/src/vssh/libssh2.c
+++ b/libs/libcurl/src/vssh/libssh2.c
@@ -728,11 +728,10 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data)
      */

     if((pub_pos != b64_pos) ||

        strncmp(fingerprint_b64, pubkey_sha256, pub_pos)) {

-      free(fingerprint_b64);

-

       failf(data,

             "Denied establishing ssh session: mismatch sha256 fingerprint. "

             "Remote %s is not equal to %s", fingerprint_b64, pubkey_sha256);

+      free(fingerprint_b64);

       state(data, SSH_SESSION_FREE);

       sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;

       return sshc->actualcode;

@@ -2019,7 +2018,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
     }

 

     case SSH_SFTP_TRANS_INIT:

-      if(data->set.upload)

+      if(data->state.upload)

         state(data, SSH_SFTP_UPLOAD_INIT);

       else {

         if(sshp->path[strlen(sshp->path)-1] == '/')

@@ -2691,7 +2690,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
         break;

       }

 

-      if(data->set.upload) {

+      if(data->state.upload) {

         if(data->state.infilesize < 0) {

           failf(data, "SCP requires a known file size for upload");

           sshc->actualcode = CURLE_UPLOAD_FAILED;

@@ -2831,7 +2830,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
     break;

 

     case SSH_SCP_DONE:

-      if(data->set.upload)

+      if(data->state.upload)

         state(data, SSH_SCP_SEND_EOF);

       else

         state(data, SSH_SCP_CHANNEL_FREE);

@@ -3274,13 +3273,23 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
                                               my_libssh2_free,

                                               my_libssh2_realloc, data);

 #else

-  sshc->ssh_session = libssh2_session_init();

+  sshc->ssh_session = libssh2_session_init_ex(NULL, NULL, NULL, data);

 #endif

   if(!sshc->ssh_session) {

     failf(data, "Failure initialising ssh session");

     return CURLE_FAILED_INIT;

   }

 

+#ifdef HAVE_LIBSSH2_VERSION

+  /* Set the packet read timeout if the libssh2 version supports it */

+#if LIBSSH2_VERSION_NUM >= 0x010B00

+  if(data->set.server_response_timeout > 0) {

+    libssh2_session_set_read_timeout(sshc->ssh_session,

+                                     data->set.server_response_timeout / 1000);

+  }

+#endif

+#endif

+

 #ifndef CURL_DISABLE_PROXY

   if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {

     /*

diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c
index bc642c306f..269199c221 100644
--- a/libs/libcurl/src/vssh/wolfssh.c
+++ b/libs/libcurl/src/vssh/wolfssh.c
@@ -425,7 +425,7 @@ static CURLcode wssh_connect(struct Curl_easy *data, bool *done)
     state(data, SSH_SFTP_INIT);

 

   return wssh_multi_statemach(data, done);

-  error:

+error:

   wolfSSH_free(sshc->ssh_session);

   wolfSSH_CTX_free(sshc->ctx);

   return CURLE_FAILED_INIT;

@@ -557,7 +557,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
       }

       break;

     case SSH_SFTP_TRANS_INIT:

-      if(data->set.upload)

+      if(data->state.upload)

         state(data, SSH_SFTP_UPLOAD_INIT);

       else {

         if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/')