62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From a0dbe0d556e073804cc549802569577bb24757d9 Mon Sep 17 00:00:00 2001
|
|
From: Norbert Pocs <norbertpocs0@gmail.com>
|
|
Date: Mon, 6 Nov 2023 20:11:38 +0100
|
|
Subject: [PATCH 7/9] CVE-2023-6004: torture_misc: Add test for ssh_is_ipaddr
|
|
|
|
Signed-off-by: Norbert Pocs <norbertpocs0@gmail.com>
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
|
|
|
Conflict: NA
|
|
Reference:https://git.libssh.org/projects/libssh.git/patch/?id=a0dbe0d556e073804cc549802569577bb24757d9
|
|
---
|
|
tests/unittests/torture_misc.c | 26 ++++++++++++++++++++++++++
|
|
1 file changed, 26 insertions(+)
|
|
|
|
diff --git a/tests/unittests/torture_misc.c b/tests/unittests/torture_misc.c
|
|
index d14f4254..073bc54c 100644
|
|
--- a/tests/unittests/torture_misc.c
|
|
+++ b/tests/unittests/torture_misc.c
|
|
@@ -728,6 +728,31 @@ static void torture_ssh_check_hostname_syntax(void **state)
|
|
assert_int_equal(rc, SSH_ERROR);
|
|
}
|
|
|
|
+static void torture_ssh_is_ipaddr(void **state) {
|
|
+ int rc;
|
|
+ (void)state;
|
|
+
|
|
+ rc = ssh_is_ipaddr("201.255.3.69");
|
|
+ assert_int_equal(rc, 1);
|
|
+ rc = ssh_is_ipaddr("::1");
|
|
+ assert_int_equal(rc, 1);
|
|
+ rc = ssh_is_ipaddr("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
|
|
+ assert_int_equal(rc, 1);
|
|
+
|
|
+ rc = ssh_is_ipaddr("..");
|
|
+ assert_int_equal(rc, 0);
|
|
+ rc = ssh_is_ipaddr(":::");
|
|
+ assert_int_equal(rc, 0);
|
|
+ rc = ssh_is_ipaddr("1.1.1.1.1");
|
|
+ assert_int_equal(rc, 0);
|
|
+ rc = ssh_is_ipaddr("1.1");
|
|
+ assert_int_equal(rc, 0);
|
|
+ rc = ssh_is_ipaddr("caesar");
|
|
+ assert_int_equal(rc, 0);
|
|
+ rc = ssh_is_ipaddr("::xa:1");
|
|
+ assert_int_equal(rc, 0);
|
|
+}
|
|
+
|
|
int torture_run_tests(void) {
|
|
int rc;
|
|
struct CMUnitTest tests[] = {
|
|
@@ -751,6 +776,7 @@ int torture_run_tests(void) {
|
|
cmocka_unit_test(torture_ssh_mkdirs),
|
|
cmocka_unit_test(torture_ssh_quote_file_name),
|
|
cmocka_unit_test(torture_ssh_check_hostname_syntax),
|
|
+ cmocka_unit_test(torture_ssh_is_ipaddr),
|
|
};
|
|
|
|
ssh_init();
|
|
--
|
|
2.33.0
|
|
|