romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-16 16:36:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

url: remove ssh_config_matches

Browse source 
The CURLOPT_SSH_HOST_PUBLIC_KEY_* options are documented to verify the
host at connect time and not for connection reuse. Once the SSH host has
been deemed okay, it remains okay as long as the connection survives.

In addition: this function currently always returned TRUE since the
pointers have been NULLed in the SSH backend code before this function
is called.

Follow-up to c31fcf2dec

Reported-by: Andrew Nesbit
Closes #21519
This commit is contained in:
Daniel Stenberg 2026-05-07 09:04:55 +02:00
parent 94729ce4e4
commit 3e9817cd1b
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/url.c
View file

@ -682,19 +682,6 @@ CURLcode Curl_conn_upkeep(struct Curl_easy *data,
return result;
}
#ifdef USE_SSH
static bool ssh_config_matches(struct connectdata *one,
struct connectdata *two)
{
struct ssh_conn *sshc1, *sshc2;
sshc1 = Curl_conn_meta_get(one, CURL_META_SSH_CONN);
sshc2 = Curl_conn_meta_get(two, CURL_META_SSH_CONN);
return sshc1 && sshc2 && Curl_safecmp(sshc1->rsa, sshc2->rsa) &&
Curl_safecmp(sshc1->rsa_pub, sshc2->rsa_pub);
}
#endif
struct url_conn_match {
struct connectdata *found;
struct Curl_easy *data;
@ -947,12 +934,6 @@ static bool url_match_proto_config(struct connectdata *conn,
if(!url_match_http_version(conn, m))
return FALSE;
#ifdef USE_SSH
if(get_protocol_family(m->needle->scheme) & PROTO_FAMILY_SSH) {
if(!ssh_config_matches(m->needle, conn))
return FALSE;
}
#endif
#ifndef CURL_DISABLE_FTP
else if(get_protocol_family(m->needle->scheme) & PROTO_FAMILY_FTP) {
if(!ftp_conns_match(m->needle, conn))