lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

auth: Add cert auth support to ssh_userauth_publickey()

Browse Source 
Signed-off-by: Axel Eppe <aeppe@google.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Axel Eppe
2016-03-01 00:44:56 +00:00
committed by Andreas Schneider
parent 6cbab4936d
commit 8923a01264
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/auth.c
View File

@@ -524,7 +524,7 @@ fail:
} }
/** /**
* @brief Authenticate with public/private key. * @brief Authenticate with public/private key or certificate.
* *
* @param[in] session The SSH session. * @param[in] session The SSH session.
* *
@@ -552,6 +552,8 @@ int ssh_userauth_publickey(ssh_session session,
{ {
ssh_string str = NULL; ssh_string str = NULL;
int rc; int rc;
const char *type_c;
enum ssh_keytypes_e key_type;
if (session == NULL) { if (session == NULL) {
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
@@ -587,7 +589,11 @@ int ssh_userauth_publickey(ssh_session session,
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
/* public key */ /* Cert auth requires presenting the cert type name (*-cert@openssh.com) */
key_type = privkey->cert != NULL ? privkey->cert_type : privkey->type;
type_c = ssh_key_type_to_char(key_type);
/* get public key or cert */
rc = ssh_pki_export_pubkey_blob(privkey, &str); rc = ssh_pki_export_pubkey_blob(privkey, &str);
if (rc < 0) { if (rc < 0) {
goto fail; goto fail;
@@ -600,8 +606,8 @@ int ssh_userauth_publickey(ssh_session session,
"ssh-connection", "ssh-connection",
"publickey", "publickey",
1, /* private key */ 1, /* private key */
privkey->type_c, /* algo */ type_c, /* algo */
str /* public key */ str /* public key or cert */
); );
if (rc < 0) { if (rc < 0) {
goto fail; goto fail;