lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00
Code Activity

hostkey.c: fix ed25519-cert host key initialization (#2064)

Browse Source 
When using `ssh-ed25519-cert-v01@openssh.com` host key the init function
didn't parse the cert correctly leading to a `Unable to initialize
hostkey importer` error on log in.

Credit: Will Cosgrove

---------

Co-authored-by: Viktor Szakats <vszakats@users.noreply.github.com>
This commit is contained in:
Will Cosgrove
2026-06-17 14:38:42 -07:00
committed by GitHub
parent f09854fac1
commit 65a276e8fe
1 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/hostkey.c
View File

@@ -1102,6 +1102,63 @@ static int hostkey_method_ssh_ed25519_init(LIBSSH2_SESSION *session,
return 0;
}
/*
* hostkey_method_ssh_ed25519_cert_init
*
* Initialize the server hostkey cert
*/
static int hostkey_method_ssh_ed25519_cert_init(
LIBSSH2_SESSION *session,
const unsigned char *hostkey_data,
size_t hostkey_data_len,
void **abstract)
{
size_t key_len, nonce_len;
unsigned char *key;
ssh2_ed25519_ctx *ctx = NULL;
struct string_buf buf;
unsigned char *nonce;
if(*abstract) {
hostkey_method_ssh_ed25519_dtor(session, abstract);
*abstract = NULL;
}
/* 4 + 32 + 4 + 16 + 4 */
if(hostkey_data_len < 60) {
ssh2_deb((session, LIBSSH2_TRACE_ERROR, "host key length too short"));
return -1;
}
buf.data = (unsigned char *)SSH2_UNCONST(hostkey_data);
buf.dataptr = buf.data;
buf.len = hostkey_data_len;
if(ssh2_match_string(&buf, "ssh-ed25519-cert-v01@openssh.com"))
return -1;
/* nonce - must be min of 16 bytes */
if(ssh2_get_string(&buf, &nonce, &nonce_len) || nonce_len < 16)
return -1;
/* public key */
if(ssh2_get_string(&buf, &key, &key_len))
return -1;
/*
* we can't check for eob here because certs
* have more meta data we don't read
*/
if(ssh2_ed25519_new_public(&ctx, session, key, key_len) != 0) {
return -1;
}
*abstract = ctx;
return 0;
}
/*
* Load a Private Key from a PEM file
*/
@@ -1239,7 +1296,7 @@ static const struct hostkey_method hostkey_method_ssh_ed25519 = {
static const struct hostkey_method hostkey_method_ssh_ed25519_cert = {
"ssh-ed25519-cert-v01@openssh.com",
SHA256_DIGEST_LENGTH,
hostkey_method_ssh_ed25519_init,
hostkey_method_ssh_ed25519_cert_init,
hostkey_method_ssh_ed25519_initPEM,
hostkey_method_ssh_ed25519_initPEMFromMemory,
hostkey_method_ssh_ed25519_sig_verify,