lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

kex,packet,packet_cb: Reformat

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2018-11-07 10:34:38 +01:00
committed by Andreas Schneider
parent bf2c7128ab
commit e639c9d0d8
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/kex.c
View File

@@ -428,9 +428,10 @@ out:
return is_wrong; return is_wrong;
} }
SSH_PACKET_CALLBACK(ssh_packet_kexinit){ SSH_PACKET_CALLBACK(ssh_packet_kexinit)
{
int i, ok; int i, ok;
int server_kex=session->server; int server_kex = session->server;
ssh_string str = NULL; ssh_string str = NULL;
char *strings[KEX_METHODS_SIZE] = {0}; char *strings[KEX_METHODS_SIZE] = {0};
int rc = SSH_ERROR; int rc = SSH_ERROR;
@@ -441,9 +442,9 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit){
(void)type; (void)type;
(void)user; (void)user;
if (session->session_state == SSH_SESSION_STATE_AUTHENTICATED){ if (session->session_state == SSH_SESSION_STATE_AUTHENTICATED) {
SSH_LOG(SSH_LOG_WARNING, "Other side initiating key re-exchange"); SSH_LOG(SSH_LOG_WARNING, "Other side initiating key re-exchange");
} else if(session->session_state != SSH_SESSION_STATE_INITIAL_KEX){ } else if (session->session_state != SSH_SESSION_STATE_INITIAL_KEX) {
ssh_set_error(session,SSH_FATAL,"SSH_KEXINIT received in wrong state"); ssh_set_error(session,SSH_FATAL,"SSH_KEXINIT received in wrong state");
goto error; goto error;
} }

2
src/packet.c
View File

@@ -953,7 +953,7 @@ int ssh_packet_socket_callback(const void *data, size_t receivedlen, void *user)
size_t processed = 0; /* number of byte processed from the callback */ size_t processed = 0; /* number of byte processed from the callback */
enum ssh_packet_filter_result_e filter_result; enum ssh_packet_filter_result_e filter_result;
if(session->current_crypto != NULL) { if (session->current_crypto != NULL) {
current_macsize = hmac_digest_len(session->current_crypto->in_hmac); current_macsize = hmac_digest_len(session->current_crypto->in_hmac);
} }
if (lenfield_blocksize == 0) { if (lenfield_blocksize == 0) {

2
src/packet_cb.c
View File

@@ -252,7 +252,7 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
session->ssh_connection_callback(session); session->ssh_connection_callback(session);
return SSH_PACKET_USED; return SSH_PACKET_USED;
error: error:
session->session_state=SSH_SESSION_STATE_ERROR; session->session_state = SSH_SESSION_STATE_ERROR;
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }

1
src/pki.c
View File

@@ -2206,6 +2206,7 @@ ssh_string ssh_srv_pki_do_sign_sessionid(ssh_session session,
if (session == NULL || privkey == NULL || !ssh_key_is_private(privkey)) { if (session == NULL || privkey == NULL || !ssh_key_is_private(privkey)) {
return NULL; return NULL;
} }
crypto = session->next_crypto ? session->next_crypto : crypto = session->next_crypto ? session->next_crypto :
session->current_crypto; session->current_crypto;