maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Authenticat with key if present.

Browse Source
This commit is contained in:
Michael Jumper 2013-12-01 16:31:11 -08:00
parent dc490a714e
commit 18d9cae183
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/protocols/ssh/ssh_client.c
View File

@ -135,6 +135,25 @@ void* ssh_input_thread(void* data) {
} }
static int __sign_callback(LIBSSH2_SESSION* session,
unsigned char** sig, size_t* sig_len,
const unsigned char* data, size_t data_len, void **abstract) {
ssh_key* key = (ssh_key*) abstract;
/* Allocate space for signature */
*sig = malloc(4096);
/* Sign with key */
*sig_len = ssh_key_sign(key, (const char*) data, data_len, *sig);
if (*sig_len < 0)
return 1;
return 0;
}
static LIBSSH2_SESSION* __guac_ssh_create_session(guac_client* client) { static LIBSSH2_SESSION* __guac_ssh_create_session(guac_client* client) {
int retval; int retval;
@ -225,19 +244,20 @@ static LIBSSH2_SESSION* __guac_ssh_create_session(guac_client* client) {
} }
/* Authenticate with key if available */ /* Authenticate with key if available */
#if 0
if (client_data->key != NULL) { if (client_data->key != NULL) {
if (ssh_userauth_publickey(session, NULL, client_data->key) if (!libssh2_userauth_publickey(session, client_data->username,
== SSH_AUTH_SUCCESS) (unsigned char*) client_data->key->public_key,
client_data->key->public_key_length,
__sign_callback, (void**) client_data->key))
return session; return session;
else { else {
char* error_message;
libssh2_session_last_error(session, &error_message, NULL, 0);
guac_client_log_error(client, guac_client_log_error(client,
"Public key authentication failed: %s", "Public key authentication failed: %s", error_message);
ssh_get_error(session));
return NULL; return NULL;
} }
} }
#endif
/* Authenticate with password */ /* Authenticate with password */
if (!libssh2_userauth_password(session, client_data->username, if (!libssh2_userauth_password(session, client_data->username,