diff options
| author |   djm <djm@openbsd.org> | 2014-06-24 01:13:21 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2014-06-24 01:13:21 +0000 |
| commit | ea2d82896aadc5516ed8ed1ff9a4ef9408d5e35e (patch) | |
| tree | e4b629e51465a0e8cfe0dfb9d18f14cbcfad801d /usr.bin/ssh/sshbuf-misc.c | |
| parent | regress test for broken consecutive revoked serial number ranges (diff) | |
| download | wireguard-openbsd-ea2d82896aadc5516ed8ed1ff9a4ef9408d5e35e.tar.xz wireguard-openbsd-ea2d82896aadc5516ed8ed1ff9a4ef9408d5e35e.zip | |
New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.
with and ok markus@
Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.
Diffstat (limited to 'usr.bin/ssh/sshbuf-misc.c')
| -rw-r--r-- | usr.bin/ssh/sshbuf-misc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshbuf-misc.c b/usr.bin/ssh/sshbuf-misc.c index 6ee32538e35..2ac38e1bab1 100644 --- a/usr.bin/ssh/sshbuf-misc.c +++ b/usr.bin/ssh/sshbuf-misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf-misc.c,v 1.1 2014/04/30 05:29:56 djm Exp $ */ +/* $OpenBSD: sshbuf-misc.c,v 1.2 2014/06/24 01:13:21 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -31,12 +31,11 @@ #include "sshbuf.h" void -sshbuf_dump(struct sshbuf *buf, FILE *f) +sshbuf_dump_data(const void *s, size_t len, FILE *f) { - const u_char *p = sshbuf_ptr(buf); - size_t i, j, len = sshbuf_len(buf); + size_t i, j; + const u_char *p = (const u_char *)s; - fprintf(f, "buffer %p len = %zu\n", buf, len); for (i = 0; i < len; i += 16) { fprintf(f, "%.4zd: ", i); for (j = i; j < i + 16; j++) { @@ -58,6 +57,13 @@ sshbuf_dump(struct sshbuf *buf, FILE *f) } } +void +sshbuf_dump(struct sshbuf *buf, FILE *f) +{ + fprintf(f, "buffer %p len = %zu\n", buf, sshbuf_len(buf)); + sshbuf_dump_data(sshbuf_ptr(buf), sshbuf_len(buf), f); +} + char * sshbuf_dtob16(struct sshbuf *buf) { |