libssh2: return error when ssh_hostkeyfunc returns error

return CURLE_PEER_FAILED_VERIFICATION if verification with the callback
return a result different than CURLKHMATCH_OK

Closes #10034

diff --git a/.mailmap b/.mailmap
index cda33ffae99881c0698cb576fdfc4e97099aeffe..5c0c9df1234222916ad0bdf7ab3ab1b9d4a08ec1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -100,3 +100,4 @@ zhanghu on xiaomi <zhanghu6@xiaomi.com>
 Philip Heiduck <pheiduck@Philips-MBP.lan> <47042125+pheiduck@users.noreply.github.com>
 bsergean on github <bsergean@gmail.com>
 Stefan Eissing <stefan@eissing.org> <stefan.eissing@greenbytes.de>
+Michael Musset <mickamusset@gmail.com>

diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index d23926dbc07b281fdc5f60b2765bc70b56b2c4ee..ce9229f8faed4af7cf554f99d0b07b317bfd678a 100644 (file)
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -791,10 +791,14 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data)
         Curl_set_in_callback(data, false);
         if(rc!= CURLKHMATCH_OK) {
           state(data, SSH_SESSION_FREE);
+          sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;
+          return sshc->actualcode;
         }
       }
       else {
         state(data, SSH_SESSION_FREE);
+        sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;
+        return sshc->actualcode;
       }
       return CURLE_OK;
     }