lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

packet: log when data-based rekeying needed

Browse Source 
Log an SSH_LOG_PACKET debug message when rekeying is necessary due to
the cipher max_blocks configuration.

Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jon Simons
2019-04-24 10:09:03 -07:00
committed by Andreas Schneider
parent 175375bc09
commit 7ef2fe7f7b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/packet.c
View File

@@ -961,6 +961,7 @@ ssh_packet_get_current_crypto(ssh_session session,
static bool ssh_packet_need_rekey(ssh_session session, static bool ssh_packet_need_rekey(ssh_session session,
const uint32_t payloadsize) const uint32_t payloadsize)
{ {
bool data_rekey_needed = false;
struct ssh_crypto_struct *crypto = NULL; struct ssh_crypto_struct *crypto = NULL;
struct ssh_cipher_struct *out_cipher = NULL, *in_cipher = NULL; struct ssh_cipher_struct *out_cipher = NULL, *in_cipher = NULL;
uint32_t next_blocks; uint32_t next_blocks;
@@ -1009,10 +1010,18 @@ static bool ssh_packet_need_rekey(ssh_session session,
* signalize our intention to rekey * signalize our intention to rekey
*/ */
next_blocks = payloadsize / out_cipher->blocksize; next_blocks = payloadsize / out_cipher->blocksize;
return (out_cipher->max_blocks != 0 && data_rekey_needed = (out_cipher->max_blocks != 0 &&
out_cipher->blocks + next_blocks > out_cipher->max_blocks) || out_cipher->blocks + next_blocks > out_cipher->max_blocks) ||
(in_cipher->max_blocks != 0 && (in_cipher->max_blocks != 0 &&
in_cipher->blocks + next_blocks > in_cipher->max_blocks); in_cipher->blocks + next_blocks > in_cipher->max_blocks);
SSH_LOG(SSH_LOG_PACKET,
"packet: [data_rekey_needed=%d, out_blocks=%" PRIu64 ", in_blocks=%" PRIu64,
data_rekey_needed,
out_cipher->blocks + next_blocks,
in_cipher->blocks + next_blocks);
return data_rekey_needed;
} }
/* in nonblocking mode, socket_read will read as much as it can, and return */ /* in nonblocking mode, socket_read will read as much as it can, and return */