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

reformat: some nits

Browse Source 
Signed-off-by: Gauravsingh Sisodia <xaerru@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Gauravsingh Sisodia
2025-08-07 12:16:41 +00:00
committed by Jakub Jelen
parent 5d06ee459b
commit 213556ce01
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/kex.h
View File

@@ -31,6 +31,7 @@ struct ssh_kex_struct {
char *methods[SSH_KEX_METHODS]; char *methods[SSH_KEX_METHODS];
}; };
/* crypto.h needs ssh_kex_struct so it is included below the struct definition */
#include "libssh/crypto.h" #include "libssh/crypto.h"
#ifdef __cplusplus #ifdef __cplusplus

2
include/libssh/session.h
View File

@@ -68,7 +68,7 @@ enum ssh_pending_call_e {
SSH_PENDING_CALL_AUTH_KBDINT_INIT, SSH_PENDING_CALL_AUTH_KBDINT_INIT,
SSH_PENDING_CALL_AUTH_KBDINT_SEND, SSH_PENDING_CALL_AUTH_KBDINT_SEND,
SSH_PENDING_CALL_AUTH_GSSAPI_MIC, SSH_PENDING_CALL_AUTH_GSSAPI_MIC,
SSH_PENDING_CALL_AUTH_GSSAPI_KEYEX SSH_PENDING_CALL_AUTH_GSSAPI_KEYEX,
}; };
/* libssh calls may block an undefined amount of time */ /* libssh calls may block an undefined amount of time */

4
src/auth.c
View File

@@ -119,12 +119,14 @@ static const char *ssh_auth_get_current_method(ssh_session session)
case SSH_AUTH_METHOD_INTERACTIVE: case SSH_AUTH_METHOD_INTERACTIVE:
method = "keyboard interactive"; method = "keyboard interactive";
break; break;
#ifdef WITH_GSSAPI
case SSH_AUTH_METHOD_GSSAPI_MIC: case SSH_AUTH_METHOD_GSSAPI_MIC:
method = "gssapi"; method = "gssapi";
break; break;
case SSH_AUTH_METHOD_GSSAPI_KEYEX: case SSH_AUTH_METHOD_GSSAPI_KEYEX:
method = "gssapi-keyex"; method = "gssapi-keyex";
break; break;
#endif
default: default:
break; break;
} }
@@ -274,12 +276,14 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_failure) {
if (strstr(auth_methods, "hostbased") != NULL) { if (strstr(auth_methods, "hostbased") != NULL) {
session->auth.supported_methods |= SSH_AUTH_METHOD_HOSTBASED; session->auth.supported_methods |= SSH_AUTH_METHOD_HOSTBASED;
} }
#ifdef WITH_GSSAPI
if (strstr(auth_methods, "gssapi-with-mic") != NULL) { if (strstr(auth_methods, "gssapi-with-mic") != NULL) {
session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_MIC; session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_MIC;
} }
if (strstr(auth_methods, "gssapi-keyex") != NULL) { if (strstr(auth_methods, "gssapi-keyex") != NULL) {
session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_KEYEX; session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_KEYEX;
} }
#endif
end: end:
session->auth.current_method = SSH_AUTH_METHOD_UNKNOWN; session->auth.current_method = SSH_AUTH_METHOD_UNKNOWN;

11
src/dh-gss.c
View File

@@ -39,27 +39,27 @@
static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_reply); static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_reply);
static ssh_packet_callback gss_dh_client_callbacks[] = { static ssh_packet_callback gss_dh_client_callbacks[] = {
ssh_packet_client_gss_dh_reply ssh_packet_client_gss_dh_reply,
}; };
static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callbacks = { static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callbacks = {
.start = SSH2_MSG_KEXGSS_COMPLETE, .start = SSH2_MSG_KEXGSS_COMPLETE,
.n_callbacks = 1, .n_callbacks = 1,
.callbacks = gss_dh_client_callbacks, .callbacks = gss_dh_client_callbacks,
.user = NULL .user = NULL,
}; };
static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_hostkey); static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_hostkey);
static ssh_packet_callback gss_dh_client_callback_hostkey[] = { static ssh_packet_callback gss_dh_client_callback_hostkey[] = {
ssh_packet_client_gss_dh_hostkey ssh_packet_client_gss_dh_hostkey,
}; };
static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callback_hostkey = { static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callback_hostkey = {
.start = SSH2_MSG_KEXGSS_HOSTKEY, .start = SSH2_MSG_KEXGSS_HOSTKEY,
.n_callbacks = 1, .n_callbacks = 1,
.callbacks = gss_dh_client_callback_hostkey, .callbacks = gss_dh_client_callback_hostkey,
.user = NULL .user = NULL,
}; };
/** @internal /** @internal
@@ -285,7 +285,8 @@ static struct ssh_packet_callbacks_struct ssh_gss_dh_server_callbacks = {
.start = SSH2_MSG_KEXGSS_INIT, .start = SSH2_MSG_KEXGSS_INIT,
.n_callbacks = 1, .n_callbacks = 1,
.callbacks = gss_dh_server_callbacks, .callbacks = gss_dh_server_callbacks,
.user = NULL}; .user = NULL,
};
/** @internal /** @internal
* @brief sets up the gssapi kex callbacks * @brief sets up the gssapi kex callbacks

5
src/packet_cb.c
View File

@@ -177,8 +177,8 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys)
/* 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 {
if (session->opts.gssapi_key_exchange) {
#ifdef WITH_GSSAPI #ifdef WITH_GSSAPI
if (session->opts.gssapi_key_exchange) {
OM_uint32 maj_stat, min_stat; OM_uint32 maj_stat, min_stat;
gss_buffer_desc mic = GSS_C_EMPTY_BUFFER, msg = GSS_C_EMPTY_BUFFER; gss_buffer_desc mic = GSS_C_EMPTY_BUFFER, msg = GSS_C_EMPTY_BUFFER;
@@ -200,8 +200,9 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys)
goto error; goto error;
} }
SSH_STRING_FREE(session->gssapi_key_exchange_mic); SSH_STRING_FREE(session->gssapi_key_exchange_mic);
} else
#endif #endif
} else { {
ssh_key server_key = NULL; ssh_key server_key = NULL;
/* client */ /* client */