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_crypto: 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:10:33 +01:00
parent d97770b025
commit 8525b4bb01
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pki_crypto.c
View File

@@ -1190,7 +1190,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
if (key->cert != NULL) { if (key->cert != NULL) {
rc = ssh_buffer_add_buffer(buffer, key->cert); rc = ssh_buffer_add_buffer(buffer, key->cert);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
goto makestring; goto makestring;
@@ -1198,14 +1198,14 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
type_s = ssh_string_from_char(key->type_c); type_s = ssh_string_from_char(key->type_c);
if (type_s == NULL) { if (type_s == NULL) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
rc = ssh_buffer_add_ssh_string(buffer, type_s); rc = ssh_buffer_add_ssh_string(buffer, type_s);
SSH_STRING_FREE(type_s); SSH_STRING_FREE(type_s);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
@@ -1304,21 +1304,21 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
#ifdef HAVE_OPENSSL_ECC #ifdef HAVE_OPENSSL_ECC
type_s = ssh_string_from_char(pki_key_ecdsa_nid_to_char(key->ecdsa_nid)); type_s = ssh_string_from_char(pki_key_ecdsa_nid_to_char(key->ecdsa_nid));
if (type_s == NULL) { if (type_s == NULL) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
rc = ssh_buffer_add_ssh_string(buffer, type_s); rc = ssh_buffer_add_ssh_string(buffer, type_s);
SSH_STRING_FREE(type_s); SSH_STRING_FREE(type_s);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
e = make_ecpoint_string(EC_KEY_get0_group(key->ecdsa), e = make_ecpoint_string(EC_KEY_get0_group(key->ecdsa),
EC_KEY_get0_public_key(key->ecdsa)); EC_KEY_get0_public_key(key->ecdsa));
if (e == NULL) { if (e == NULL) {
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return NULL; return NULL;
} }
@@ -1348,11 +1348,11 @@ makestring:
if (rc < 0) { if (rc < 0) {
goto fail; goto fail;
} }
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
return str; return str;
fail: fail:
ssh_buffer_free(buffer); SSH_BUFFER_FREE(buffer);
ssh_string_burn(str); ssh_string_burn(str);
SSH_STRING_FREE(str); SSH_STRING_FREE(str);
ssh_string_burn(e); ssh_string_burn(e);
@@ -1521,7 +1521,7 @@ static ssh_string pki_ecdsa_signature_to_blob(const ssh_signature sig)
SSH_STRING_FREE(r); SSH_STRING_FREE(r);
SSH_STRING_FREE(s); SSH_STRING_FREE(s);
ECDSA_SIG_free(ecdsa_sig); ECDSA_SIG_free(ecdsa_sig);
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return sig_blob; return sig_blob;
@@ -1529,7 +1529,7 @@ error:
SSH_STRING_FREE(r); SSH_STRING_FREE(r);
SSH_STRING_FREE(s); SSH_STRING_FREE(s);
ECDSA_SIG_free(ecdsa_sig); ECDSA_SIG_free(ecdsa_sig);
ssh_buffer_free(buf); SSH_BUFFER_FREE(buf);
return NULL; return NULL;
} }