aboutsummaryrefslogtreecommitdiff
path: root/src/pki_container_openssh.c
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2015-09-25 01:25:56 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2016-01-19 11:31:08 +0100
commitd1d003c23226dc429327fd473f829544c1e3636a (patch)
tree6e075f3686c3d67327c440b30535dac525e905dc /src/pki_container_openssh.c
parent3cf72e52586ab1ebff360d9b4f989ef15abfefa6 (diff)
downloadlibssh-d1d003c23226dc429327fd473f829544c1e3636a.tar.gz
libssh-d1d003c23226dc429327fd473f829544c1e3636a.tar.xz
libssh-d1d003c23226dc429327fd473f829544c1e3636a.zip
buffer: use ssh_buffer_get() instead of ssh_buffer_get_begin()
This commit is a preparatory stage for removing ssh_buffer_get_begin(). Note that removing ssh_buffer_get_begin() doesn't break API compatibility, as this functions has never been exposed (it only has the LIBSSH_API prefix). Signed-off-by: Fabiano FidĂȘncio <fidencio@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/pki_container_openssh.c')
-rw-r--r--src/pki_container_openssh.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pki_container_openssh.c b/src/pki_container_openssh.c
index 93370468..551a7f03 100644
--- a/src/pki_container_openssh.c
+++ b/src/pki_container_openssh.c
@@ -543,8 +543,8 @@ static int pki_private_key_encrypt(ssh_buffer privkey_buffer,
key_material,
key_material + cipher.keysize/8);
cipher.encrypt(&cipher,
- ssh_buffer_get_begin(privkey_buffer),
- ssh_buffer_get_begin(privkey_buffer),
+ ssh_buffer_get(privkey_buffer),
+ ssh_buffer_get(privkey_buffer),
ssh_buffer_get_len(privkey_buffer));
ssh_cipher_clear(&cipher);
BURN_BUFFER(passphrase_buffer, sizeof(passphrase_buffer));
@@ -642,7 +642,7 @@ ssh_string ssh_pki_openssh_privkey_export(const ssh_key privkey,
goto error;
}
memcpy(ssh_string_data(kdf_options),
- ssh_buffer_get_begin(kdf_buf),
+ ssh_buffer_get(kdf_buf),
ssh_buffer_get_len(kdf_buf));
ssh_buffer_free(kdf_buf);
rc = pki_private_key_encrypt(privkey_buffer,
@@ -670,12 +670,12 @@ ssh_string ssh_pki_openssh_privkey_export(const ssh_key privkey,
pubkey_s,
(uint32_t)ssh_buffer_get_len(privkey_buffer),
/* rest of buffer is a string */
- (size_t)ssh_buffer_get_len(privkey_buffer), ssh_buffer_get_begin(privkey_buffer));
+ (size_t)ssh_buffer_get_len(privkey_buffer), ssh_buffer_get(privkey_buffer));
if (rc != SSH_OK) {
goto error;
}
- b64 = bin_to_base64(ssh_buffer_get_begin(buffer),
+ b64 = bin_to_base64(ssh_buffer_get(buffer),
ssh_buffer_get_len(buffer));
if (b64 == NULL){
goto error;
@@ -712,7 +712,7 @@ ssh_string ssh_pki_openssh_privkey_export(const ssh_key privkey,
error:
if (privkey_buffer != NULL) {
- void *bufptr = ssh_buffer_get_begin(privkey_buffer);
+ void *bufptr = ssh_buffer_get(privkey_buffer);
BURN_BUFFER(bufptr, ssh_buffer_get_len(privkey_buffer));
ssh_buffer_free(privkey_buffer);
}