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

In ssh_userauth_pubkey, if publickey argument is NULL, generate it from privatekey.

Browse Source 
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
This commit is contained in:
Vic Lee
2009-12-30 10:40:34 +08:00
committed by Andreas Schneider
parent b361fb5898
commit f2ca2d50b5
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libssh/auth.c
View File

@@ -467,7 +467,8 @@ error:
* ssh_option_set_username() has been used. You cannot try * ssh_option_set_username() has been used. You cannot try
* two different logins in a row. * two different logins in a row.
* *
* @param publickey A public key returned by publickey_from_file(). * @param publickey A public key returned by publickey_from_file(), or NULL
* to generate automatically from privatekey.
* *
* @param privatekey A private key returned by privatekey_from_file(). * @param privatekey A private key returned by privatekey_from_file().
* *
@@ -489,6 +490,8 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
ssh_string method = NULL; ssh_string method = NULL;
ssh_string algo = NULL; ssh_string algo = NULL;
ssh_string sign = NULL; ssh_string sign = NULL;
ssh_public_key pk = NULL;
ssh_string pkstr = NULL;
int rc = SSH_AUTH_ERROR; int rc = SSH_AUTH_ERROR;
enter_function(); enter_function();
@@ -534,6 +537,17 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
if (algo == NULL) { if (algo == NULL) {
goto error; goto error;
} }
if (publickey == NULL) {
pk = publickey_from_privatekey(privatekey);
if (pk == NULL) {
goto error;
}
pkstr = publickey_to_string(pk);
publickey_free(pk);
if (pkstr == NULL) {
goto error;
}
}
/* we said previously the public key was accepted */ /* we said previously the public key was accepted */
if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0 || if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0 ||
@@ -542,7 +556,7 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
buffer_add_ssh_string(session->out_buffer, method) < 0 || buffer_add_ssh_string(session->out_buffer, method) < 0 ||
buffer_add_u8(session->out_buffer, 1) < 0 || buffer_add_u8(session->out_buffer, 1) < 0 ||
buffer_add_ssh_string(session->out_buffer, algo) < 0 || buffer_add_ssh_string(session->out_buffer, algo) < 0 ||
buffer_add_ssh_string(session->out_buffer, publickey) < 0) { buffer_add_ssh_string(session->out_buffer, (publickey == NULL ? pkstr : publickey)) < 0) {
goto error; goto error;
} }
@@ -550,6 +564,7 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
string_free(service); string_free(service);
string_free(method); string_free(method);
string_free(algo); string_free(algo);
string_free(pkstr);
sign = ssh_do_sign(session,session->out_buffer, privatekey); sign = ssh_do_sign(session,session->out_buffer, privatekey);
if (sign) { if (sign) {
@@ -573,6 +588,7 @@ error:
string_free(service); string_free(service);
string_free(method); string_free(method);
string_free(algo); string_free(algo);
string_free(pkstr);
leave_function(); leave_function();
return rc; return rc;