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: Use SSH_BUFFER_FREE()

Browse Source 
Fixes T183

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2019-10-28 12:09:07 +01:00
parent 189fd76589
commit f89cf79c49
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/pki.c
View File

@@ -174,7 +174,7 @@ void ssh_key_clean (ssh_key key){
} }
SAFE_FREE(key->ed25519_pubkey); SAFE_FREE(key->ed25519_pubkey);
if (key->cert != NULL) { if (key->cert != NULL) {
ssh_buffer_free(key->cert); SSH_BUFFER_FREE(key->cert);
} }
key->cert_type = SSH_KEYTYPE_UNKNOWN; key->cert_type = SSH_KEYTYPE_UNKNOWN;
key->flags=SSH_KEY_FLAG_EMPTY; key->flags=SSH_KEY_FLAG_EMPTY;
@@ -1449,7 +1449,7 @@ static int pki_import_cert_buffer(ssh_buffer buffer,
fail: fail:
ssh_key_free(key); ssh_key_free(key);
ssh_buffer_free(cert); SSH_BUFFER_FREE(cert);
return SSH_ERROR; return SSH_ERROR;
} }
@@ -1485,7 +1485,7 @@ int ssh_pki_import_pubkey_base64(const char *b64_key,
type_s = ssh_buffer_get_ssh_string(buffer); type_s = ssh_buffer_get_ssh_string(buffer);
if (type_s == NULL) { if (type_s == NULL) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return SSH_ERROR; return SSH_ERROR;
} }
SSH_STRING_FREE(type_s); SSH_STRING_FREE(type_s);
@@ -1495,7 +1495,7 @@ int ssh_pki_import_pubkey_base64(const char *b64_key,
} else { } else {
rc = pki_import_pubkey_buffer(buffer, type, pkey); rc = pki_import_pubkey_buffer(buffer, type, pkey);
} }
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return rc; return rc;
} }
@@ -1558,11 +1558,11 @@ int ssh_pki_import_pubkey_blob(const ssh_string key_blob,
rc = pki_import_pubkey_buffer(buffer, type, pkey); rc = pki_import_pubkey_buffer(buffer, type, pkey);
} }
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return rc; return rc;
fail: fail:
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
SSH_STRING_FREE(type_s); SSH_STRING_FREE(type_s);
return SSH_ERROR; return SSH_ERROR;
@@ -2029,7 +2029,7 @@ int ssh_pki_copy_cert_to_privkey(const ssh_key certkey, ssh_key privkey) {
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;
} }
@@ -2056,38 +2056,38 @@ int ssh_pki_export_signature_blob(const ssh_signature sig,
str = ssh_string_from_char(sig->type_c); str = ssh_string_from_char(sig->type_c);
if (str == NULL) { if (str == NULL) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
rc = ssh_buffer_add_ssh_string(buf, str); rc = ssh_buffer_add_ssh_string(buf, str);
SSH_STRING_FREE(str); SSH_STRING_FREE(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
str = pki_signature_to_blob(sig); str = pki_signature_to_blob(sig);
if (str == NULL) { if (str == NULL) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
rc = ssh_buffer_add_ssh_string(buf, str); rc = ssh_buffer_add_ssh_string(buf, str);
SSH_STRING_FREE(str); SSH_STRING_FREE(str);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
str = ssh_string_new(ssh_buffer_get_len(buf)); str = ssh_string_new(ssh_buffer_get_len(buf));
if (str == NULL) { if (str == NULL) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
ssh_string_fill(str, ssh_buffer_get(buf), ssh_buffer_get_len(buf)); ssh_string_fill(str, ssh_buffer_get(buf), ssh_buffer_get_len(buf));
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
*sig_blob = str; *sig_blob = str;
@@ -2119,13 +2119,13 @@ int ssh_pki_import_signature_blob(const ssh_string sig_blob,
ssh_string_data(sig_blob), ssh_string_data(sig_blob),
ssh_string_len(sig_blob)); ssh_string_len(sig_blob));
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
algorithm = ssh_buffer_get_ssh_string(buf); algorithm = ssh_buffer_get_ssh_string(buf);
if (algorithm == NULL) { if (algorithm == NULL) {
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return SSH_ERROR; return SSH_ERROR;
} }
@@ -2135,7 +2135,7 @@ int ssh_pki_import_signature_blob(const ssh_string sig_blob,
SSH_STRING_FREE(algorithm); SSH_STRING_FREE(algorithm);
blob = ssh_buffer_get_ssh_string(buf); blob = ssh_buffer_get_ssh_string(buf);
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
if (blob == NULL) { if (blob == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
@@ -2366,7 +2366,7 @@ ssh_string ssh_pki_do_sign(ssh_session session,
end: end:
ssh_signature_free(sig); ssh_signature_free(sig);
ssh_buffer_free(sign_input); SSH_BUFFER_FREE(sign_input);
SSH_STRING_FREE(session_id); SSH_STRING_FREE(session_id);
return sig_blob; return sig_blob;
@@ -2404,21 +2404,21 @@ ssh_string ssh_pki_do_sign_agent(ssh_session session,
rc = ssh_buffer_add_ssh_string(sig_buf, session_id); rc = ssh_buffer_add_ssh_string(sig_buf, session_id);
if (rc < 0) { if (rc < 0) {
SSH_STRING_FREE(session_id); SSH_STRING_FREE(session_id);
ssh_buffer_free(sig_buf); SSH_BUFFER_FREE(sig_buf);
return NULL; return NULL;
} }
SSH_STRING_FREE(session_id); SSH_STRING_FREE(session_id);
/* append out buffer */ /* append out buffer */
if (ssh_buffer_add_buffer(sig_buf, buf) < 0) { if (ssh_buffer_add_buffer(sig_buf, buf) < 0) {
ssh_buffer_free(sig_buf); SSH_BUFFER_FREE(sig_buf);
return NULL; return NULL;
} }
/* create signature */ /* create signature */
sig_blob = ssh_agent_sign_data(session, pubkey, sig_buf); sig_blob = ssh_agent_sign_data(session, pubkey, sig_buf);
ssh_buffer_free(sig_buf); SSH_BUFFER_FREE(sig_buf);
return sig_blob; return sig_blob;
} }
@@ -2482,7 +2482,7 @@ ssh_string ssh_srv_pki_do_sign_sessionid(ssh_session session,
end: end:
ssh_signature_free(sig); ssh_signature_free(sig);
ssh_buffer_free(sign_input); SSH_BUFFER_FREE(sign_input);
return sig_blob; return sig_blob;
} }