mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
ssh-libssh: fix infinite connect loop on invalid private key
Added test 656 (based on test 604) to verify the fix. Bug: https://bugzilla.redhat.com/1595135 Closes #2879
This commit is contained in:
parent
1e843a31a4
commit
a4c7911a48
@ -663,6 +663,7 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block)
|
|||||||
if(rc != SSH_OK) {
|
if(rc != SSH_OK) {
|
||||||
failf(data, "Could not load private key file %s",
|
failf(data, "Could not load private key file %s",
|
||||||
data->set.str[STRING_SSH_PRIVATE_KEY]);
|
data->set.str[STRING_SSH_PRIVATE_KEY]);
|
||||||
|
MOVE_TO_ERROR_STATE(CURLE_LOGIN_DENIED);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ test617 test618 test619 test620 test621 test622 test623 test624 test625 \
|
|||||||
test626 test627 test628 test629 test630 test631 test632 test633 test634 \
|
test626 test627 test628 test629 test630 test631 test632 test633 test634 \
|
||||||
test635 test636 test637 test638 test639 test640 test641 test642 \
|
test635 test636 test637 test638 test639 test640 test641 test642 \
|
||||||
test643 test644 test645 test646 test647 test648 test649 test650 test651 \
|
test643 test644 test645 test646 test647 test648 test649 test650 test651 \
|
||||||
test652 test653 test654 test655 \
|
test652 test653 test654 test655 test656 \
|
||||||
\
|
\
|
||||||
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
|
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
|
||||||
test709 test710 test711 test712 test713 test714 test715 \
|
test709 test710 test711 test712 test713 test714 test715 \
|
||||||
|
33
tests/data/test656
Normal file
33
tests/data/test656
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
<testcase>
|
||||||
|
<info>
|
||||||
|
<keywords>
|
||||||
|
SFTP
|
||||||
|
FAILURE
|
||||||
|
</keywords>
|
||||||
|
</info>
|
||||||
|
|
||||||
|
#
|
||||||
|
# Client-side
|
||||||
|
<client>
|
||||||
|
<server>
|
||||||
|
sftp
|
||||||
|
</server>
|
||||||
|
<name>
|
||||||
|
SFTP retrieval with nonexistent private key file
|
||||||
|
</name>
|
||||||
|
<command>
|
||||||
|
--key DOES_NOT_EXIST --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/not-a-valid-file-moooo --insecure --connect-timeout 8
|
||||||
|
</command>
|
||||||
|
</client>
|
||||||
|
|
||||||
|
#
|
||||||
|
# Verify data after the test has been "shot"
|
||||||
|
<verify>
|
||||||
|
<valgrind>
|
||||||
|
disable
|
||||||
|
</valgrind>
|
||||||
|
<errorcode>
|
||||||
|
67
|
||||||
|
</errorcode>
|
||||||
|
</verify>
|
||||||
|
</testcase>
|
Loading…
Reference in New Issue
Block a user