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

pki: Reformat ssh_pki_copy_cert_to_privkey()

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-04-24 15:15:59 +02:00
committed by Andreas Schneider
parent f6709b03e6
commit 937552aed2
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/pki.c
View File

@@ -2311,42 +2311,43 @@ int ssh_pki_export_pubkey_file(const ssh_key key,
* *
* @returns SSH_OK on success, SSH_ERROR otherwise. * @returns SSH_OK on success, SSH_ERROR otherwise.
**/ **/
int ssh_pki_copy_cert_to_privkey(const ssh_key certkey, ssh_key privkey) { int ssh_pki_copy_cert_to_privkey(const ssh_key certkey, ssh_key privkey)
ssh_buffer cert_buffer; {
int rc, cmp; ssh_buffer cert_buffer;
int rc, cmp;
if (certkey == NULL || privkey == NULL) { if (certkey == NULL || privkey == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
if (privkey->cert != NULL) { if (privkey->cert != NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
if (certkey->cert == NULL) { if (certkey->cert == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
/* make sure the public keys match */ /* make sure the public keys match */
cmp = ssh_key_cmp(certkey, privkey, SSH_KEY_CMP_PUBLIC); cmp = ssh_key_cmp(certkey, privkey, SSH_KEY_CMP_PUBLIC);
if (cmp != 0) { if (cmp != 0) {
return SSH_ERROR; return SSH_ERROR;
} }
cert_buffer = ssh_buffer_new(); cert_buffer = ssh_buffer_new();
if (cert_buffer == NULL) { if (cert_buffer == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
rc = ssh_buffer_add_buffer(cert_buffer, certkey->cert); rc = ssh_buffer_add_buffer(cert_buffer, certkey->cert);
if (rc != 0) { if (rc != 0) {
SSH_BUFFER_FREE(cert_buffer); SSH_BUFFER_FREE(cert_buffer);
return SSH_ERROR; return SSH_ERROR;
} }
privkey->cert = cert_buffer; privkey->cert = cert_buffer;
privkey->cert_type = certkey->type; privkey->cert_type = certkey->type;
return SSH_OK; return SSH_OK;
} }
int ssh_pki_export_signature_blob(const ssh_signature sig, int ssh_pki_export_signature_blob(const ssh_signature sig,