diff options
Diffstat (limited to 'sshbuf-misc.c')
-rw-r--r-- | sshbuf-misc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sshbuf-misc.c b/sshbuf-misc.c index 22dbfd5a4..bfeffe674 100644 --- a/sshbuf-misc.c +++ b/sshbuf-misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf-misc.c,v 1.1 2014/04/30 05:29:56 djm Exp $ */ | 1 | /* $OpenBSD: sshbuf-misc.c,v 1.2 2014/06/24 01:13:21 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -33,12 +33,11 @@ | |||
33 | #include "sshbuf.h" | 33 | #include "sshbuf.h" |
34 | 34 | ||
35 | void | 35 | void |
36 | sshbuf_dump(struct sshbuf *buf, FILE *f) | 36 | sshbuf_dump_data(const void *s, size_t len, FILE *f) |
37 | { | 37 | { |
38 | const u_char *p = sshbuf_ptr(buf); | 38 | size_t i, j; |
39 | size_t i, j, len = sshbuf_len(buf); | 39 | const u_char *p = (const u_char *)s; |
40 | 40 | ||
41 | fprintf(f, "buffer %p len = %zu\n", buf, len); | ||
42 | for (i = 0; i < len; i += 16) { | 41 | for (i = 0; i < len; i += 16) { |
43 | fprintf(f, "%.4zd: ", i); | 42 | fprintf(f, "%.4zd: ", i); |
44 | for (j = i; j < i + 16; j++) { | 43 | for (j = i; j < i + 16; j++) { |
@@ -60,6 +59,13 @@ sshbuf_dump(struct sshbuf *buf, FILE *f) | |||
60 | } | 59 | } |
61 | } | 60 | } |
62 | 61 | ||
62 | void | ||
63 | sshbuf_dump(struct sshbuf *buf, FILE *f) | ||
64 | { | ||
65 | fprintf(f, "buffer %p len = %zu\n", buf, sshbuf_len(buf)); | ||
66 | sshbuf_dump_data(sshbuf_ptr(buf), sshbuf_len(buf), f); | ||
67 | } | ||
68 | |||
63 | char * | 69 | char * |
64 | sshbuf_dtob16(struct sshbuf *buf) | 70 | sshbuf_dtob16(struct sshbuf *buf) |
65 | { | 71 | { |