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

Rest in Peace SSHv1

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2018-06-28 17:52:58 +02:00
parent 81b4320318
commit 206f3ff895
56 changed files with 328 additions and 3139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/unittests/torture_misc.c
View File

@@ -218,16 +218,12 @@ static void torture_timeout_update(void **state){
static void torture_ssh_analyze_banner(void **state) {
int rc = 0;
int ssh1 = 0;
int ssh2 = 0;
ssh_session session = NULL;
(void) state;
#define reset_banner_test() \
do { \
rc = 0; \
ssh1 = 0; \
ssh2 = 0; \
ssh_free(session); \
session = ssh_new(); \
assert_non_null(session); \
@@ -235,7 +231,7 @@ static void torture_ssh_analyze_banner(void **state) {
#define assert_banner_rejected(is_server) \
do { \
rc = ssh_analyze_banner(session, is_server, &ssh1, &ssh2); \
rc = ssh_analyze_banner(session, is_server); \
assert_int_not_equal(0, rc); \
} while (0);
@@ -257,29 +253,27 @@ static void torture_ssh_analyze_banner(void **state) {
SAFE_FREE(session->serverbanner); \
} while (0)
#define assert_banner_accepted(is_server, expected_ssh1, expected_ssh2) \
#define assert_banner_accepted(is_server) \
do { \
rc = ssh_analyze_banner(session, is_server, &ssh1, &ssh2); \
rc = ssh_analyze_banner(session, is_server); \
assert_int_equal(0, rc); \
assert_int_equal(expected_ssh1, ssh1); \
assert_int_equal(expected_ssh2, ssh2); \
} while (0)
#define assert_client_banner_accepted(banner, e1, e2) \
#define assert_client_banner_accepted(banner) \
do { \
reset_banner_test(); \
session->clientbanner = strdup(banner); \
assert_non_null(session->clientbanner); \
assert_banner_accepted(1 /*server*/, e1, e2); \
assert_banner_accepted(1 /*server*/); \
SAFE_FREE(session->clientbanner); \
} while (0)
#define assert_server_banner_accepted(banner, e1, e2) \
#define assert_server_banner_accepted(banner) \
do { \
reset_banner_test(); \
session->serverbanner = strdup(banner); \
assert_non_null(session->serverbanner); \
assert_banner_accepted(0 /*client*/, e1, e2); \
assert_banner_accepted(0 /*client*/); \
SAFE_FREE(session->serverbanner); \
} while (0)
@@ -298,60 +292,60 @@ static void torture_ssh_analyze_banner(void **state) {
assert_server_banner_rejected("abc-2.0");
/* SSH v1 */
assert_client_banner_accepted("SSH-1.0", 1, 0);
assert_server_banner_accepted("SSH-1.0", 1, 0);
assert_client_banner_rejected("SSH-1.0");
assert_server_banner_rejected("SSH-1.0");
/* SSH v1.9 gets counted as both v1 and v2 */
assert_client_banner_accepted("SSH-1.9", 1, 1);
assert_server_banner_accepted("SSH-1.9", 1, 1);
assert_client_banner_accepted("SSH-1.9");
assert_server_banner_accepted("SSH-1.9");
/* SSH v2 */
assert_client_banner_accepted("SSH-2.0", 0, 1);
assert_server_banner_accepted("SSH-2.0", 0, 1);
assert_client_banner_accepted("SSH-2.0");
assert_server_banner_accepted("SSH-2.0");
/* OpenSSH banners: too short to extract major and minor versions */
assert_client_banner_accepted("SSH-2.0-OpenSSH", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH");
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH");
assert_int_equal(0, session->openssh);
/* OpenSSH banners: big enough to extract major and minor versions */
assert_client_banner_accepted("SSH-2.0-OpenSSH_5.9p1", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_5.9p1");
assert_int_equal(SSH_VERSION_INT(5, 9, 0), session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_5.9p1", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_5.9p1");
assert_int_equal(SSH_VERSION_INT(5, 9, 0), session->openssh);
assert_client_banner_accepted("SSH-2.0-OpenSSH_1.99", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_1.99");
assert_int_equal(SSH_VERSION_INT(1, 99, 0), session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.99", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.99");
assert_int_equal(SSH_VERSION_INT(1, 99, 0), session->openssh);
/* OpenSSH banners: major, minor version limits result in zero */
assert_client_banner_accepted("SSH-2.0-OpenSSH_0.99p1", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_0.99p1");
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_0.99p1", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_0.99p1");
assert_int_equal(0, session->openssh);
assert_client_banner_accepted("SSH-2.0-OpenSSH_1.101p1", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_1.101p1");
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.101p1", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_1.101p1");
assert_int_equal(0, session->openssh);
/* OpenSSH banners: bogus major results in zero */
assert_client_banner_accepted("SSH-2.0-OpenSSH_X.9p1", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_X.9p1");
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH_X.9p1", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_X.9p1");
assert_int_equal(0, session->openssh);
/* OpenSSH banners: bogus minor results in zero */
assert_server_banner_accepted("SSH-2.0-OpenSSH_5.Yp1", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH_5.Yp1");
assert_int_equal(0, session->openssh);
assert_client_banner_accepted("SSH-2.0-OpenSSH_5.Yp1", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH_5.Yp1");
assert_int_equal(0, session->openssh);
/* OpenSSH banners: ssh-keyscan(1) */
assert_client_banner_accepted("SSH-2.0-OpenSSH-keyscan", 0, 1);
assert_client_banner_accepted("SSH-2.0-OpenSSH-keyscan");
assert_int_equal(0, session->openssh);
assert_server_banner_accepted("SSH-2.0-OpenSSH-keyscan", 0, 1);
assert_server_banner_accepted("SSH-2.0-OpenSSH-keyscan");
assert_int_equal(0, session->openssh);
ssh_free(session);