diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2019-10-31 09:41:09 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-12-09 16:38:36 +0100 |
| commit | b21cba0c3cf6008dc13e13bc928f069c63cb4549 (patch) | |
| tree | 678310c59930700074bf097780fb4f6a6ed7f511 | |
| parent | 7498167e6c9fea35f55a03136b3023655b9e0d2c (diff) | |
| download | libssh-b21cba0c3cf6008dc13e13bc928f069c63cb4549.tar.gz libssh-b21cba0c3cf6008dc13e13bc928f069c63cb4549.tar.xz libssh-b21cba0c3cf6008dc13e13bc928f069c63cb4549.zip | |
pki_container_openssh: 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 d7abfe7e8f06b2e96600d1f1fa6522d42b106f8e)
| -rw-r--r-- | src/pki_container_openssh.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pki_container_openssh.c b/src/pki_container_openssh.c index f7ec0f4c..5ad87b53 100644 --- a/src/pki_container_openssh.c +++ b/src/pki_container_openssh.c @@ -159,7 +159,7 @@ static int pki_private_key_decrypt(ssh_string blob, if (rc != SSH_ERROR){ rc = ssh_buffer_unpack(buffer, "Sd", &salt, &rounds); } - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); if (rc == SSH_ERROR){ return SSH_ERROR; } @@ -364,11 +364,11 @@ ssh_pki_openssh_import(const char *text_key, } out: if (buffer != NULL) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); buffer = NULL; } if (privkey_buffer != NULL) { - ssh_buffer_free(privkey_buffer); + SSH_BUFFER_FREE(privkey_buffer); privkey_buffer = NULL; } SAFE_FREE(magic); @@ -620,26 +620,26 @@ ssh_string ssh_pki_openssh_privkey_export(const ssh_key privkey, salt = ssh_string_new(16); if (salt == NULL){ - ssh_buffer_free(kdf_buf); + SSH_BUFFER_FREE(kdf_buf); goto error; } ok = ssh_get_random(ssh_string_data(salt), 16, 0); if (!ok) { - ssh_buffer_free(kdf_buf); + SSH_BUFFER_FREE(kdf_buf); goto error; } ssh_buffer_pack(kdf_buf, "Sd", salt, rounds); kdf_options = ssh_string_new(ssh_buffer_get_len(kdf_buf)); if (kdf_options == NULL){ - ssh_buffer_free(kdf_buf); + SSH_BUFFER_FREE(kdf_buf); goto error; } memcpy(ssh_string_data(kdf_options), ssh_buffer_get(kdf_buf), ssh_buffer_get_len(kdf_buf)); - ssh_buffer_free(kdf_buf); + SSH_BUFFER_FREE(kdf_buf); rc = pki_private_key_encrypt(privkey_buffer, passphrase, "aes128-cbc", @@ -709,13 +709,13 @@ error: if (privkey_buffer != NULL) { void *bufptr = ssh_buffer_get(privkey_buffer); explicit_bzero(bufptr, ssh_buffer_get_len(privkey_buffer)); - ssh_buffer_free(privkey_buffer); + SSH_BUFFER_FREE(privkey_buffer); } SAFE_FREE(pubkey_s); SAFE_FREE(kdf_options); SAFE_FREE(salt); if (buffer != NULL) { - ssh_buffer_free(buffer); + SSH_BUFFER_FREE(buffer); } return str; |