69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
|
From 622421018b58392ffecc29726b947e089b678221 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
Date: Fri, 15 Dec 2023 15:39:12 +0100
|
||
|
|
Subject: [PATCH 19/20] CVE-2023-6918: tests: Code coverage for
|
||
|
|
ssh_get_pubkey_hash()
|
||
|
|
|
||
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
||
|
|
---
|
||
|
|
tests/client/torture_session.c | 35 ++++++++++++++++++++++++++++++++++
|
||
|
|
1 file changed, 35 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/client/torture_session.c b/tests/client/torture_session.c
|
||
|
|
index 27e8fc86..c437d421 100644
|
||
|
|
--- a/tests/client/torture_session.c
|
||
|
|
+++ b/tests/client/torture_session.c
|
||
|
|
@@ -391,6 +391,38 @@ static void torture_freed_channel_get_exit_status(void **state)
|
||
|
|
assert_ssh_return_code_equal(session, rc, SSH_ERROR);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void torture_pubkey_hash(void **state)
|
||
|
|
+{
|
||
|
|
+ struct torture_state *s = *state;
|
||
|
|
+ ssh_session session = s->ssh.session;
|
||
|
|
+ char *hash = NULL;
|
||
|
|
+ char *hexa = NULL;
|
||
|
|
+ int rc = 0;
|
||
|
|
+
|
||
|
|
+ /* bad arguments */
|
||
|
|
+ rc = ssh_get_pubkey_hash(session, NULL);
|
||
|
|
+ assert_int_equal(rc, SSH_ERROR);
|
||
|
|
+
|
||
|
|
+ rc = ssh_get_pubkey_hash(NULL, (unsigned char **)&hash);
|
||
|
|
+ assert_int_equal(rc, SSH_ERROR);
|
||
|
|
+
|
||
|
|
+ /* deprecated, but should be covered by tests! */
|
||
|
|
+ rc = ssh_get_pubkey_hash(session, (unsigned char **)&hash);
|
||
|
|
+ if (ssh_fips_mode()) {
|
||
|
|
+ /* When in FIPS mode, expect the call to fail */
|
||
|
|
+ assert_int_equal(rc, SSH_ERROR);
|
||
|
|
+ } else {
|
||
|
|
+ assert_int_equal(rc, MD5_DIGEST_LEN);
|
||
|
|
+
|
||
|
|
+ hexa = ssh_get_hexa((unsigned char *)hash, rc);
|
||
|
|
+ SSH_STRING_FREE_CHAR(hash);
|
||
|
|
+ assert_string_equal(hexa,
|
||
|
|
+ "ee:80:7f:61:f9:d5:be:f1:96:86:cc:96:7a:db:7a:7b");
|
||
|
|
+
|
||
|
|
+ SSH_STRING_FREE_CHAR(hexa);
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int torture_run_tests(void) {
|
||
|
|
int rc;
|
||
|
|
struct CMUnitTest tests[] = {
|
||
|
|
@@ -421,6 +453,9 @@ int torture_run_tests(void) {
|
||
|
|
cmocka_unit_test_setup_teardown(torture_freed_channel_get_exit_status,
|
||
|
|
session_setup,
|
||
|
|
session_teardown),
|
||
|
|
+ cmocka_unit_test_setup_teardown(torture_pubkey_hash,
|
||
|
|
+ session_setup,
|
||
|
|
+ session_teardown),
|
||
|
|
};
|
||
|
|
|
||
|
|
ssh_init();
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|