diff options
author | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-09-17 09:43:33 +0200 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2016-01-19 11:31:07 +0100 |
commit | adc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081 (patch) | |
tree | 1bcd7318e12a316d4908b7eee4914bad7e2db80b /src/pki_container_openssh.c | |
parent | 63e52afd5b9a378918ea3591e2da8fe78c201407 (diff) | |
download | libssh-adc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081.tar.gz libssh-adc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081.tar.xz libssh-adc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081.zip |
cleanup: use ssh_ prefix in the buffer (non-static) functions
Having "ssh_" prefix in the functions' name will avoid possible clashes
when compiling libssh statically.
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.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pki_container_openssh.c b/src/pki_container_openssh.c index 2d1ee25d..4f5e947a 100644 --- a/src/pki_container_openssh.c +++ b/src/pki_container_openssh.c @@ -384,11 +384,11 @@ ssh_key ssh_pki_openssh_privkey_import(const char *text_key, if (rc == SSH_ERROR){ goto error; } - comment = buffer_get_ssh_string(privkey_buffer); + comment = ssh_buffer_get_ssh_string(privkey_buffer); SAFE_FREE(comment); /* verify that the remaining data is correct padding */ - for (i=1; buffer_get_rest_len(privkey_buffer) > 0; ++i){ - buffer_get_u8(privkey_buffer, &padding); + for (i=1; ssh_buffer_get_rest_len(privkey_buffer) > 0; ++i){ + ssh_buffer_get_u8(privkey_buffer, &padding); if (padding != i){ ssh_key_free(key); key = NULL; @@ -493,7 +493,7 @@ static int pki_private_key_encrypt(ssh_buffer privkey_buffer, return SSH_ERROR; } while (ssh_buffer_get_len(privkey_buffer) % cipher.blocksize != 0) { - rc = buffer_add_u8(privkey_buffer, padding); + rc = ssh_buffer_add_u8(privkey_buffer, padding); if (rc < 0) { return SSH_ERROR; } @@ -704,7 +704,7 @@ ssh_string ssh_pki_openssh_privkey_export(const ssh_key privkey, } str_len = ssh_buffer_get_len(buffer); - len = buffer_get_data(buffer, ssh_string_data(str), str_len); + len = ssh_buffer_get_data(buffer, ssh_string_data(str), str_len); if (str_len != len) { ssh_string_free(str); str = NULL; |