aboutsummaryrefslogtreecommitdiff
path: root/src/pki_crypto.c
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2015-09-17 09:43:33 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2016-01-19 11:31:07 +0100
commitadc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081 (patch)
tree1bcd7318e12a316d4908b7eee4914bad7e2db80b /src/pki_crypto.c
parent63e52afd5b9a378918ea3591e2da8fe78c201407 (diff)
downloadlibssh-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_crypto.c')
-rw-r--r--src/pki_crypto.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/pki_crypto.c b/src/pki_crypto.c
index 7a3caba4..811bb47a 100644
--- a/src/pki_crypto.c
+++ b/src/pki_crypto.c
@@ -888,7 +888,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
return NULL;
}
- rc = buffer_add_ssh_string(buffer, type_s);
+ rc = ssh_buffer_add_ssh_string(buffer, type_s);
ssh_string_free(type_s);
if (rc < 0) {
ssh_buffer_free(buffer);
@@ -917,16 +917,16 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
goto fail;
}
- if (buffer_add_ssh_string(buffer, p) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, p) < 0) {
goto fail;
}
- if (buffer_add_ssh_string(buffer, q) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, q) < 0) {
goto fail;
}
- if (buffer_add_ssh_string(buffer, g) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, g) < 0) {
goto fail;
}
- if (buffer_add_ssh_string(buffer, n) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, n) < 0) {
goto fail;
}
@@ -956,10 +956,10 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
goto fail;
}
- if (buffer_add_ssh_string(buffer, e) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, e) < 0) {
goto fail;
}
- if (buffer_add_ssh_string(buffer, n) < 0) {
+ if (ssh_buffer_add_ssh_string(buffer, n) < 0) {
goto fail;
}
@@ -985,7 +985,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
return NULL;
}
- rc = buffer_add_ssh_string(buffer, type_s);
+ rc = ssh_buffer_add_ssh_string(buffer, type_s);
ssh_string_free(type_s);
if (rc < 0) {
ssh_buffer_free(buffer);
@@ -998,7 +998,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
return NULL;
}
- rc = buffer_add_ssh_string(buffer, type_s);
+ rc = ssh_buffer_add_ssh_string(buffer, type_s);
ssh_string_free(type_s);
if (rc < 0) {
ssh_buffer_free(buffer);
@@ -1012,7 +1012,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
return NULL;
}
- rc = buffer_add_ssh_string(buffer, e);
+ rc = ssh_buffer_add_ssh_string(buffer, e);
if (rc < 0) {
goto fail;
}
@@ -1034,12 +1034,12 @@ ssh_string pki_publickey_to_blob(const ssh_key key)
goto fail;
}
- str = ssh_string_new(buffer_get_rest_len(buffer));
+ str = ssh_string_new(ssh_buffer_get_rest_len(buffer));
if (str == NULL) {
goto fail;
}
- rc = ssh_string_fill(str, buffer_get_rest(buffer), buffer_get_rest_len(buffer));
+ rc = ssh_string_fill(str, ssh_buffer_get_rest(buffer), ssh_buffer_get_rest_len(buffer));
if (rc < 0) {
goto fail;
}
@@ -1219,7 +1219,7 @@ ssh_string pki_signature_to_blob(const ssh_signature sig)
ssh_buffer_free(b);
return NULL;
}
- rc = buffer_add_ssh_string(b, r);
+ rc = ssh_buffer_add_ssh_string(b, r);
ssh_string_free(r);
if (rc < 0) {
ssh_buffer_free(b);
@@ -1231,20 +1231,20 @@ ssh_string pki_signature_to_blob(const ssh_signature sig)
ssh_buffer_free(b);
return NULL;
}
- rc = buffer_add_ssh_string(b, s);
+ rc = ssh_buffer_add_ssh_string(b, s);
ssh_string_free(s);
if (rc < 0) {
ssh_buffer_free(b);
return NULL;
}
- sig_blob = ssh_string_new(buffer_get_rest_len(b));
+ sig_blob = ssh_string_new(ssh_buffer_get_rest_len(b));
if (sig_blob == NULL) {
ssh_buffer_free(b);
return NULL;
}
- ssh_string_fill(sig_blob, buffer_get_rest(b), buffer_get_rest_len(b));
+ ssh_string_fill(sig_blob, ssh_buffer_get_rest(b), ssh_buffer_get_rest_len(b));
ssh_buffer_free(b);
break;
}
@@ -1428,7 +1428,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
return NULL;
}
- r = buffer_get_ssh_string(b);
+ r = ssh_buffer_get_ssh_string(b);
if (r == NULL) {
ssh_buffer_free(b);
ssh_signature_free(sig);
@@ -1448,8 +1448,8 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
return NULL;
}
- s = buffer_get_ssh_string(b);
- rlen = buffer_get_rest_len(b);
+ s = ssh_buffer_get_ssh_string(b);
+ rlen = ssh_buffer_get_len(b);
ssh_buffer_free(b);
if (s == NULL) {
ssh_signature_free(sig);