shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

misc: relax fatal errors in ssh_analyze_banner

Browse Source 
Relax the cases where `ssh_analyze_banner` fails to extract a
major and minor version from banners which appear like OpenSSH
banners.

Update the tests to demonstrate that now a banner as might be
sent by `ssh-keyscan(1)` ("SSH-2.0-OpenSSH-keyscan") no longer
returns failure.

Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jon Simons
2017-07-11 19:34:18 -04:00
committed by Andreas Schneider
parent e66f370682
commit 380390c4b6
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/unittests/torture_misc.c
View File

@@ -315,35 +315,33 @@ static void torture_ssh_analyze_banner(void **state) {
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.99", 0, 1);
assert_int_equal(SSH_VERSION_INT(1, 99, 0), session->openssh);
/* OpenSSH banners: major, minor version limits */
reset_banner_test();
assert_client_banner_rejected("SSH-2.0-OpenSSH_0.99p1");
reset_banner_test();
assert_server_banner_rejected("SSH-2.0-OpenSSH_0.99p1");
reset_banner_test();
assert_client_banner_rejected("SSH-2.0-OpenSSH_1.101p1");
reset_banner_test();
assert_server_banner_rejected("SSH-2.0-OpenSSH_1.101p1");
/* OpenSSH banners: major, minor version limits result in zero */
assert_client_banner_accepted("SSH-2.0-OpenSSH_0.99p1", 0, 1);
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_0.99p1", 0, 1);
assert_int_equal(0, session->openssh);
assert_client_banner_accepted("SSH-2.0-OpenSSH_1.101p1", 0, 1);
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.101p1", 0, 1);
assert_int_equal(0, session->openssh);
/* OpenSSH banners: bogus major */
reset_banner_test();
assert_client_banner_rejected("SSH-2.0-OpenSSH_X.9p1");
reset_banner_test();
assert_server_banner_rejected("SSH-2.0-OpenSSH_X.9p1");
/* OpenSSH banners: bogus major results in zero */
assert_client_banner_accepted("SSH-2.0-OpenSSH_X.9p1", 0, 1);
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_X.9p1", 0, 1);
assert_int_equal(0, session->openssh);
/* OpenSSH banners: bogus minor */
reset_banner_test();
assert_server_banner_rejected("SSH-2.0-OpenSSH_5.Yp1");
reset_banner_test();
assert_client_banner_rejected("SSH-2.0-OpenSSH_5.Yp1");
/* OpenSSH banners: bogus minor results in zero */
assert_server_banner_accepted("SSH-2.0-OpenSSH_5.Yp1", 0, 1);
assert_int_equal(0, session->openssh);
assert_client_banner_accepted("SSH-2.0-OpenSSH_5.Yp1", 0, 1);
assert_int_equal(0, session->openssh);
/* OpenSSH banners: ssh-keyscan(1) */
#if 0 /* these don't pass */
assert_client_banner_accepted("SSH-2.0-OpenSSH-keyscan", 0, 1);
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH-keyscan", 0, 1);
assert_int_equal(0, session->openssh);
#endif /* these don't pass */
ssh_free(session);
}