diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2019-10-28 12:10:33 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-12-09 16:08:03 +0100 |
commit | 8525b4bb016532528cbbca7d6a30a82b0cb8789d (patch) | |
tree | 0b43ef8f81b4e67f0d3c95fc4c20eb22734f497a /src/pki_crypto.c | |
parent | d97770b025a6d1e42c86711e825425bf224c5093 (diff) | |
download | libssh-8525b4bb016532528cbbca7d6a30a82b0cb8789d.tar.gz libssh-8525b4bb016532528cbbca7d6a30a82b0cb8789d.tar.xz libssh-8525b4bb016532528cbbca7d6a30a82b0cb8789d.zip |
pki_crypto: Use SSH_BUFFER_FREE()
Fixes T183
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Diffstat (limited to 'src/pki_crypto.c')
-rw-r--r-- | src/pki_crypto.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pki_crypto.c b/src/pki_crypto.c index 4649fb0c..e2a3d3bf 100644 --- a/src/pki_crypto.c +++ b/src/pki_crypto.c @@ -1190,7 +1190,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key) if (key->cert != NULL) { rc = ssh_buffer_add_buffer(buffer, key->cert); if (rc < 0) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } 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); if (type_s == NULL) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } rc = ssh_buffer_add_ssh_string(buffer, type_s); SSH_STRING_FREE(type_s); if (rc < 0) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } @@ -1304,21 +1304,21 @@ ssh_string pki_publickey_to_blob(const ssh_key key) #ifdef HAVE_OPENSSL_ECC type_s = ssh_string_from_char(pki_key_ecdsa_nid_to_char(key->ecdsa_nid)); if (type_s == NULL) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } rc = ssh_buffer_add_ssh_string(buffer, type_s); SSH_STRING_FREE(type_s); if (rc < 0) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } e = make_ecpoint_string(EC_KEY_get0_group(key->ecdsa), EC_KEY_get0_public_key(key->ecdsa)); if (e == NULL) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return NULL; } @@ -1348,11 +1348,11 @@ makestring: if (rc < 0) { goto fail; } - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); return str; fail: - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); ssh_string_burn(str); SSH_STRING_FREE(str); 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(s); ECDSA_SIG_free(ecdsa_sig); - ssh_buffer_free(buf); + SSH_BUFFER_FREE(buf); return sig_blob; @@ -1529,7 +1529,7 @@ error: SSH_STRING_FREE(r); SSH_STRING_FREE(s); ECDSA_SIG_free(ecdsa_sig); - ssh_buffer_free(buf); + SSH_BUFFER_FREE(buf); return NULL; } |