diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 15:28:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 15:28:02 +1000 |
commit | 8668706d0f52654fe64c0ca41a96113aeab8d2b8 (patch) | |
tree | 73e78e1ea3d39206e39870bbe0af17d6c430fb51 /sshbuf-misc.c | |
parent | 2cd7929250cf9e9f658d70dcd452f529ba08c942 (diff) |
- djm@cvs.openbsd.org 2014/06/24 01:13:21
[Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
[auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
[cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
[digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
[hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
[ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
[ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
[ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
[sshconnect2.c sshd.c sshkey.c sshkey.h
[openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
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.
NB. This commit also removes portable OpenSSH support for OpenSSL
<0.9.8e.
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 | { |