diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2020-02-23 18:37:09 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2020-03-07 03:06:11 -0500 |
| commit | 09aa807240b9dcde78a919ff712316a1daf0655e (patch) | |
| tree | f94d596f877bd3b95aa0933e88b3af0f02bd6b40 /tests/data | |
| parent | e54b1885d19dee5ed04761295020a0a84b8296ca (diff) | |
libssh: Fix matching user-specified MD5 hex key
Prior to this change a match would never be successful because it
was mistakenly coded to compare binary data from libssh to a
user-specified hex string (ie CURLOPT_SSH_HOST_PUBLIC_KEY_MD5).
Reported-by: fds242@users.noreply.github.com
Fixes https://github.com/curl/curl/issues/4971
Closes https://github.com/curl/curl/pull/4974
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test664 | 44 | ||||
| -rw-r--r-- | tests/data/test665 | 44 |
3 files changed, 89 insertions, 1 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index dfc74320e..9afbf7437 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -85,7 +85,7 @@ test626 test627 test628 test629 test630 test631 test632 test633 test634 \ test635 test636 test637 test638 test639 test640 test641 test642 \ test643 test644 test645 test646 test647 test648 test649 test650 test651 \ test652 test653 test654 test655 test656 test658 test659 test660 test661 \ -test662 test663 \ +test662 test663 test664 test665 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ test709 test710 test711 test712 test713 test714 test715 test716 test717 \ diff --git a/tests/data/test664 b/tests/data/test664 new file mode 100644 index 000000000..cb73b248b --- /dev/null +++ b/tests/data/test664 @@ -0,0 +1,44 @@ +<testcase> +<info> +<keywords> +SFTP +server key check +</keywords> +</info> + +# +# Server-side +<reply> +<data> +test +</data> +</reply> + +# +# Client-side +<client> +<server> +sftp +</server> + <name> +SFTP correct host key + </name> + <command> +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file664.txt +</command> +<file name="log/file664.txt"> +test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<errorcode> +0 +</errorcode> +<valgrind> +disable +</valgrind> +</verify> +</testcase> diff --git a/tests/data/test665 b/tests/data/test665 new file mode 100644 index 000000000..830adb8f6 --- /dev/null +++ b/tests/data/test665 @@ -0,0 +1,44 @@ +<testcase> +<info> +<keywords> +SCP +server key check +</keywords> +</info> + +# +# Server-side +<reply> +<data> +test +</data> +</reply> + +# +# Client-side +<client> +<server> +scp +</server> + <name> +SCP correct host key + </name> + <command> +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file665.txt +</command> +<file name="log/file665.txt"> +test +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<errorcode> +0 +</errorcode> +<valgrind> +disable +</valgrind> +</verify> +</testcase> |