shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 10:40:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

packet_cb: Reformat remaining functions

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2023-08-02 17:17:07 +02:00
parent c925907917
commit d22194f0b1
1 changed files with 137 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/packet_cb.c
View File

@@ -45,11 +45,13 @@
* *
* @brief Handle a SSH_DISCONNECT packet. * @brief Handle a SSH_DISCONNECT packet.
*/ */
SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback){ SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback)
{
int rc; int rc;
uint32_t code = 0; uint32_t code = 0;
char *error = NULL; char *error = NULL;
ssh_string error_s; ssh_string error_s = NULL;
(void)user; (void)user;
(void)type; (void)type;
@@ -68,11 +70,15 @@ SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback){
session->peer_discon_msg = strdup(error); session->peer_discon_msg = strdup(error);
} }
SSH_LOG(SSH_LOG_PACKET, "Received SSH_MSG_DISCONNECT %" PRIu32 ":%s", SSH_LOG(SSH_LOG_PACKET,
code, error != NULL ? error : "no error"); "Received SSH_MSG_DISCONNECT %" PRIu32 ":%s",
ssh_set_error(session, SSH_FATAL, code,
error != NULL ? error : "no error");
ssh_set_error(session,
SSH_FATAL,
"Received SSH_MSG_DISCONNECT: %" PRIu32 ":%s", "Received SSH_MSG_DISCONNECT: %" PRIu32 ":%s",
code, error != NULL ? error : "no error"); code,
error != NULL ? error : "no error");
SAFE_FREE(error); SAFE_FREE(error);
ssh_socket_close(session->socket); ssh_socket_close(session->socket);
@@ -80,6 +86,7 @@ SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback){
session->session_state = SSH_SESSION_STATE_ERROR; session->session_state = SSH_SESSION_STATE_ERROR;
/* correctly handle disconnect during authorization */ /* correctly handle disconnect during authorization */
session->auth.state = SSH_AUTH_STATE_FAILED; session->auth.state = SSH_AUTH_STATE_FAILED;
/* TODO: handle a graceful disconnect */ /* TODO: handle a graceful disconnect */
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@@ -89,23 +96,31 @@ SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback){
* *
* @brief Handle a SSH_IGNORE and SSH_DEBUG packet. * @brief Handle a SSH_IGNORE and SSH_DEBUG packet.
*/ */
SSH_PACKET_CALLBACK(ssh_packet_ignore_callback){ SSH_PACKET_CALLBACK(ssh_packet_ignore_callback)
{
(void)session; /* unused */ (void)session; /* unused */
(void)user; (void)user;
(void)type; (void)type;
(void)packet; (void)packet;
SSH_LOG(SSH_LOG_DEBUG,"Received %s packet",type==SSH2_MSG_IGNORE ? "SSH_MSG_IGNORE" : "SSH_MSG_DEBUG");
SSH_LOG(SSH_LOG_DEBUG,
"Received %s packet",
type == SSH2_MSG_IGNORE ? "SSH_MSG_IGNORE" : "SSH_MSG_DEBUG");
/* TODO: handle a graceful disconnect */ /* TODO: handle a graceful disconnect */
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
SSH_PACKET_CALLBACK(ssh_packet_newkeys){ SSH_PACKET_CALLBACK(ssh_packet_newkeys)
{
ssh_string sig_blob = NULL; ssh_string sig_blob = NULL;
ssh_signature sig = NULL; ssh_signature sig = NULL;
int rc; int rc;
(void)packet; (void)packet;
(void)user; (void)user;
(void)type; (void)type;
SSH_LOG(SSH_LOG_DEBUG, "Received SSH_MSG_NEWKEYS"); SSH_LOG(SSH_LOG_DEBUG, "Received SSH_MSG_NEWKEYS");
if (session->session_state != SSH_SESSION_STATE_DH || if (session->session_state != SSH_SESSION_STATE_DH ||
@@ -113,15 +128,16 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
ssh_set_error(session, ssh_set_error(session,
SSH_FATAL, SSH_FATAL,
"ssh_packet_newkeys called in wrong state : %d:%d", "ssh_packet_newkeys called in wrong state : %d:%d",
session->session_state,session->dh_handshake_state); session->session_state,
session->dh_handshake_state);
goto error; goto error;
} }
if(session->server){ if (session->server) {
/* server things are done in server.c */ /* server things are done in server.c */
session->dh_handshake_state=DH_STATE_FINISHED; session->dh_handshake_state=DH_STATE_FINISHED;
} else { } else {
ssh_key server_key; ssh_key server_key = NULL;
/* client */ /* client */
@@ -144,8 +160,9 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
/* Check if signature from server matches user preferences */ /* Check if signature from server matches user preferences */
if (session->opts.wanted_methods[SSH_HOSTKEYS]) { if (session->opts.wanted_methods[SSH_HOSTKEYS]) {
if (!ssh_match_group(session->opts.wanted_methods[SSH_HOSTKEYS], rc = ssh_match_group(session->opts.wanted_methods[SSH_HOSTKEYS],
sig->type_c)) { sig->type_c);
if (rc == 0) {
ssh_set_error(session, ssh_set_error(session,
SSH_FATAL, SSH_FATAL,
"Public key from server (%s) doesn't match user " "Public key from server (%s) doesn't match user "
@@ -168,7 +185,7 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
"Failed to verify server hostkey signature"); "Failed to verify server hostkey signature");
goto error; goto error;
} }
SSH_LOG(SSH_LOG_DEBUG,"Signature verified and valid"); SSH_LOG(SSH_LOG_DEBUG, "Signature verified and valid");
/* When receiving this packet, we switch on the incoming crypto. */ /* When receiving this packet, we switch on the incoming crypto. */
rc = ssh_packet_set_newkeys(session, SSH_DIRECTION_IN); rc = ssh_packet_set_newkeys(session, SSH_DIRECTION_IN);
@@ -179,6 +196,7 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
session->dh_handshake_state = DH_STATE_FINISHED; session->dh_handshake_state = DH_STATE_FINISHED;
session->ssh_connection_callback(session); session->ssh_connection_callback(session);
return SSH_PACKET_USED; return SSH_PACKET_USED;
error: error:
SSH_SIGNATURE_FREE(sig); SSH_SIGNATURE_FREE(sig);
ssh_string_burn(sig_blob); ssh_string_burn(sig_blob);
@@ -192,14 +210,14 @@ error:
* @brief handles a SSH_SERVICE_ACCEPT packet * @brief handles a SSH_SERVICE_ACCEPT packet
* *
*/ */
SSH_PACKET_CALLBACK(ssh_packet_service_accept){ SSH_PACKET_CALLBACK(ssh_packet_service_accept)
{
(void)packet; (void)packet;
(void)type; (void)type;
(void)user; (void)user;
session->auth.service_state = SSH_AUTH_SERVICE_ACCEPTED; session->auth.service_state = SSH_AUTH_SERVICE_ACCEPTED;
SSH_LOG(SSH_LOG_PACKET, SSH_LOG(SSH_LOG_PACKET, "Received SSH_MSG_SERVICE_ACCEPT");
"Received SSH_MSG_SERVICE_ACCEPT");
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@@ -214,6 +232,7 @@ SSH_PACKET_CALLBACK(ssh_packet_ext_info)
int rc; int rc;
uint32_t nr_extensions = 0; uint32_t nr_extensions = 0;
uint32_t i; uint32_t i;
(void)type; (void)type;
(void)user; (void)user;