aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-10-08 22:08:14 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-10-12 14:45:54 +0200
commit2f8ddc6e653b76668c155ade0f90a347857486e2 (patch)
tree7379ed0163d7b2075e54bedcb152e5090170a6d5 /src
parentb1287cd946b40fd5b668378c5d7b4cc17dbc699d (diff)
downloadlibssh-2f8ddc6e653b76668c155ade0f90a347857486e2.tar.gz
libssh-2f8ddc6e653b76668c155ade0f90a347857486e2.tar.xz
libssh-2f8ddc6e653b76668c155ade0f90a347857486e2.zip
dh: Don't use strcat for ssh_get_hexa().
This is just hardening the code. Found by Coverity.
Diffstat (limited to 'src')
-rw-r--r--src/dh.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/dh.c b/src/dh.c
index 170771d7..0d46c591 100644
--- a/src/dh.c
+++ b/src/dh.c
@@ -251,23 +251,22 @@ void ssh_print_bignum(const char *which, bignum num) {
* @see ssh_string_free_char()
*/
char *ssh_get_hexa(const unsigned char *what, size_t len) {
- char *hexa = NULL;
+ const char h[] = "0123456789abcdef";
+ char *hexa;
size_t i;
+ size_t hlen = len * 3;
- hexa = malloc(len * 3 + 1);
+ hexa = malloc(hlen + 1);
if (hexa == NULL) {
return NULL;
}
- ZERO_STRUCTP(hexa);
-
for (i = 0; i < len; i++) {
- char hex[4];
- snprintf(hex, sizeof(hex), "%02x:", what[i]);
- strcat(hexa, hex);
+ hexa[i * 3] = h[(what[i] >> 4) & 0xF];
+ hexa[i * 3 + 1] = h[what[i] & 0xF];
+ hexa[i * 3 + 2] = ':';
}
-
- hexa[(len * 3) - 1] = '\0';
+ hexa[hlen - 1] = '\0';
return hexa;
}