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

pki: Simplify ed25519 private key duplication

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2025-08-01 11:56:28 +02:00
parent d1bf9068a9
commit e7cffe7e1b
1 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/pki_crypto.c
View File

@@ -723,47 +723,11 @@ ssh_key pki_key_dup(const ssh_key key, int demote)
if (!demote && (key->flags & SSH_KEY_FLAG_PRIVATE) && if (!demote && (key->flags & SSH_KEY_FLAG_PRIVATE) &&
key->type == SSH_KEYTYPE_ED25519) { key->type == SSH_KEYTYPE_ED25519) {
unsigned char *ed25519_privkey = NULL; rc = EVP_PKEY_up_ref(key->key);
size_t key_len = 0;
rc = EVP_PKEY_get_raw_private_key(key->key, NULL, &key_len);
if (rc != 1) { if (rc != 1) {
SSH_LOG(SSH_LOG_TRACE,
"Failed to get ed25519 raw private key length: %s",
ERR_error_string(ERR_get_error(), NULL));
goto fail; goto fail;
} }
new->key = key->key;
if (key_len != ED25519_KEY_LEN) {
SSH_LOG(SSH_LOG_TRACE,
"Unexpected length of private key %zu. Expected %d.",
key_len,
ED25519_KEY_LEN);
goto fail;
}
ed25519_privkey = malloc(key_len);
if (ed25519_privkey == NULL) {
SSH_LOG(SSH_LOG_TRACE, "Out of memory");
goto fail;
}
rc = EVP_PKEY_get_raw_private_key(key->key,
ed25519_privkey,
&key_len);
if (rc != 1) {
SSH_LOG(SSH_LOG_TRACE,
"Failed to get ed25519 raw private key: %s",
ERR_error_string(ERR_get_error(), NULL));
free(ed25519_privkey);
goto fail;
}
new->key = EVP_PKEY_new_raw_private_key(EVP_PKEY_ED25519,
NULL,
ed25519_privkey,
key_len);
free(ed25519_privkey);
} else { } else {
unsigned char *ed25519_pubkey = NULL; unsigned char *ed25519_pubkey = NULL;
size_t key_len = 0; size_t key_len = 0;