109 lines
4.7 KiB
Diff
109 lines
4.7 KiB
Diff
From 768d1ed30cf4b3cb9628254ef3ee24b9c38abdbc Mon Sep 17 00:00:00 2001
|
|
From: Jakub Jelen <jjelen@redhat.com>
|
|
Date: Thu, 14 Dec 2023 12:47:48 +0100
|
|
Subject: [PATCH 4/4] CVE-2023-48795: tests: Adjust calculation to strict kex
|
|
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.com/libssh/libssh-mirror/-/commit/768d1ed30cf4b3cb9628254ef3ee24b9c38abdbc
|
|
---
|
|
tests/client/torture_rekey.c | 56 ++++++++++++++++++++----------------
|
|
1 file changed, 32 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/tests/client/torture_rekey.c b/tests/client/torture_rekey.c
|
|
index 13c9a7fe..bfb273af 100644
|
|
--- a/tests/client/torture_rekey.c
|
|
+++ b/tests/client/torture_rekey.c
|
|
@@ -148,6 +148,29 @@ static void torture_rekey_default(void **state)
|
|
ssh_disconnect(s->ssh.session);
|
|
}
|
|
|
|
+static void sanity_check_session(void **state)
|
|
+{
|
|
+ struct torture_state *s = *state;
|
|
+ struct ssh_crypto_struct *c = NULL;
|
|
+
|
|
+ c = s->ssh.session->current_crypto;
|
|
+ assert_non_null(c);
|
|
+ assert_int_equal(c->in_cipher->max_blocks,
|
|
+ bytes / c->in_cipher->blocksize);
|
|
+ assert_int_equal(c->out_cipher->max_blocks,
|
|
+ bytes / c->out_cipher->blocksize);
|
|
+ /* when strict kex is used, the newkeys reset the sequence number */
|
|
+ if ((s->ssh.session->flags & SSH_SESSION_FLAG_KEX_STRICT) != 0) {
|
|
+ assert_int_equal(c->out_cipher->packets, s->ssh.session->send_seq);
|
|
+ assert_int_equal(c->in_cipher->packets, s->ssh.session->recv_seq);
|
|
+ } else {
|
|
+ /* Otherwise we have less encrypted packets than transferred
|
|
+ * (first are not encrypted) */
|
|
+ assert_true(c->out_cipher->packets < s->ssh.session->send_seq);
|
|
+ assert_true(c->in_cipher->packets < s->ssh.session->recv_seq);
|
|
+ }
|
|
+}
|
|
+
|
|
/* We lower the rekey limits manually and check that the rekey
|
|
* really happens when sending data
|
|
*/
|
|
@@ -166,16 +189,10 @@ static void torture_rekey_send(void **state)
|
|
rc = ssh_connect(s->ssh.session);
|
|
assert_ssh_return_code(s->ssh.session, rc);
|
|
|
|
- /* The blocks limit is set correctly */
|
|
- c = s->ssh.session->current_crypto;
|
|
- assert_int_equal(c->in_cipher->max_blocks,
|
|
- bytes / c->in_cipher->blocksize);
|
|
- assert_int_equal(c->out_cipher->max_blocks,
|
|
- bytes / c->out_cipher->blocksize);
|
|
- /* We should have less encrypted packets than transfered (first are not encrypted) */
|
|
- assert_true(c->out_cipher->packets < s->ssh.session->send_seq);
|
|
- assert_true(c->in_cipher->packets < s->ssh.session->recv_seq);
|
|
+ sanity_check_session(state);
|
|
/* Copy the initial secret hash = session_id so we know we changed keys later */
|
|
+ c = s->ssh.session->current_crypto;
|
|
+ assert_non_null(c);
|
|
secret_hash = malloc(c->digest_len);
|
|
assert_non_null(secret_hash);
|
|
memcpy(secret_hash, c->secret_hash, c->digest_len);
|
|
@@ -272,14 +289,10 @@ static void torture_rekey_recv(void **state)
|
|
sftp_file file;
|
|
mode_t mask;
|
|
|
|
- /* The blocks limit is set correctly */
|
|
- c = s->ssh.session->current_crypto;
|
|
- assert_int_equal(c->in_cipher->max_blocks, bytes / c->in_cipher->blocksize);
|
|
- assert_int_equal(c->out_cipher->max_blocks, bytes / c->out_cipher->blocksize);
|
|
- /* We should have less encrypted packets than transfered (first are not encrypted) */
|
|
- assert_true(c->out_cipher->packets < s->ssh.session->send_seq);
|
|
- assert_true(c->in_cipher->packets < s->ssh.session->recv_seq);
|
|
+ sanity_check_session(state);
|
|
/* Copy the initial secret hash = session_id so we know we changed keys later */
|
|
+ c = s->ssh.session->current_crypto;
|
|
+ assert_non_null(c);
|
|
secret_hash = malloc(c->digest_len);
|
|
assert_non_null(secret_hash);
|
|
memcpy(secret_hash, c->secret_hash, c->digest_len);
|
|
@@ -464,15 +477,10 @@ static void torture_rekey_different_kex(void **state)
|
|
assert_ssh_return_code(s->ssh.session, rc);
|
|
|
|
/* The blocks limit is set correctly */
|
|
- c = s->ssh.session->current_crypto;
|
|
- assert_int_equal(c->in_cipher->max_blocks,
|
|
- bytes / c->in_cipher->blocksize);
|
|
- assert_int_equal(c->out_cipher->max_blocks,
|
|
- bytes / c->out_cipher->blocksize);
|
|
- /* We should have less encrypted packets than transfered (first are not encrypted) */
|
|
- assert_true(c->out_cipher->packets < s->ssh.session->send_seq);
|
|
- assert_true(c->in_cipher->packets < s->ssh.session->recv_seq);
|
|
+ sanity_check_session(state);
|
|
/* Copy the initial secret hash = session_id so we know we changed keys later */
|
|
+ c = s->ssh.session->current_crypto;
|
|
+ assert_non_null(c);
|
|
secret_hash = malloc(c->digest_len);
|
|
assert_non_null(secret_hash);
|
|
memcpy(secret_hash, c->secret_hash, c->digest_len);
|
|
--
|
|
2.33.0
|
|
|