shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 20:30:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

SSH-01-003: Add cipher NULL checks to ssh_packet_get_current_crypto()

Browse Source 
Fixes T183

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit e60fc79542)
This commit is contained in:
Andreas Schneider
2019-10-22 11:26:02 +02:00
parent ab24d64241
commit 56c079cbb2
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/packet.c
View File

@@ -939,18 +939,38 @@ struct ssh_crypto_struct *
ssh_packet_get_current_crypto(ssh_session session,
enum ssh_crypto_direction_e direction)
{
struct ssh_crypto_struct *crypto = NULL;
if (session == NULL) {
return NULL;
}
if (session->current_crypto != NULL &&
session->current_crypto->used & direction) {
return session->current_crypto;
crypto = session->current_crypto;
} else if (session->next_crypto != NULL &&
session->next_crypto->used & direction) {
crypto = session->next_crypto;
} else {
return NULL;
}
if (session->next_crypto != NULL &&
session->next_crypto->used & direction) {
return session->next_crypto;
switch (direction) {
case SSH_DIRECTION_IN:
if (crypto->in_cipher != NULL) {
return crypto;
}
break;
case SSH_DIRECTION_OUT:
if (crypto->out_cipher != NULL) {
return crypto;
}
break;
case SSH_DIRECTION_BOTH:
if (crypto->in_cipher != NULL &&
crypto->out_cipher != NULL) {
return crypto;
}
}
return NULL;