aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2019-10-28 12:12:27 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-12-09 16:38:36 +0100
commitdeaf3f3195668fa3eb55b2cffe54627a4ecbac28 (patch)
tree72f328ed06bbab215e7e4baa69ea4576d5cb1ec3
parent123e8448e61ba6a6138591066fd5240f5ebf0fe3 (diff)
downloadlibssh-deaf3f3195668fa3eb55b2cffe54627a4ecbac28.tar.gz
libssh-deaf3f3195668fa3eb55b2cffe54627a4ecbac28.tar.xz
libssh-deaf3f3195668fa3eb55b2cffe54627a4ecbac28.zip
pki_mbedcrypto: Use SSH_BUFFER_FREE()
Fixes T183 Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com> (cherry picked from commit 0684f1b94a92996ed874b359666373f10ef29566)
-rw-r--r--src/pki_mbedcrypto.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/pki_mbedcrypto.c b/src/pki_mbedcrypto.c
index 4e9a5ca8..dd1a513e 100644
--- a/src/pki_mbedcrypto.c
+++ b/src/pki_mbedcrypto.c
@@ -653,7 +653,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;
}
@@ -662,14 +662,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;
}
@@ -677,7 +677,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
case SSH_KEYTYPE_RSA: {
mbedtls_rsa_context *rsa;
if (mbedtls_pk_can_do(key->rsa, MBEDTLS_PK_RSA) == 0) {
- ssh_buffer_free(buffer);
+ SSH_BUFFER_FREE(buffer);
return NULL;
}
@@ -716,21 +716,21 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
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(&key->ecdsa->grp, &key->ecdsa->Q);
if (e == NULL) {
- ssh_buffer_free(buffer);
+ SSH_BUFFER_FREE(buffer);
return NULL;
}
@@ -765,10 +765,10 @@ makestring:
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);
@@ -802,38 +802,38 @@ ssh_string pki_signature_to_blob(const ssh_signature sig)
r = ssh_make_bignum_string(sig->ecdsa_sig.r);
if (r == NULL) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
return NULL;
}
rc = ssh_buffer_add_ssh_string(b, r);
SSH_STRING_FREE(r);
if (rc < 0) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
return NULL;
}
s = ssh_make_bignum_string(sig->ecdsa_sig.s);
if (s == NULL) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
return NULL;
}
rc = ssh_buffer_add_ssh_string(b, s);
SSH_STRING_FREE(s);
if (rc < 0) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
return NULL;
}
sig_blob = ssh_string_new(ssh_buffer_get_len(b));
if (sig_blob == NULL) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
return NULL;
}
ssh_string_fill(sig_blob, ssh_buffer_get(b), ssh_buffer_get_len(b));
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
break;
}
case SSH_KEYTYPE_ED25519:
@@ -955,14 +955,14 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
ssh_string_len(sig_blob));
if (rc < 0) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
ssh_signature_free(sig);
return NULL;
}
r = ssh_buffer_get_ssh_string(b);
if (r == NULL) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
ssh_signature_free(sig);
return NULL;
}
@@ -973,14 +973,14 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
ssh_string_burn(r);
SSH_STRING_FREE(r);
if (sig->ecdsa_sig.r == NULL) {
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
ssh_signature_free(sig);
return NULL;
}
s = ssh_buffer_get_ssh_string(b);
rlen = ssh_buffer_get_len(b);
- ssh_buffer_free(b);
+ SSH_BUFFER_FREE(b);
if (s == NULL) {
ssh_signature_free(sig);
return NULL;