summaryrefslogtreecommitdiff
path: root/sshbuf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-02 15:28:02 +1000
committerDamien Miller <djm@mindrot.org>2014-07-02 15:28:02 +1000
commit8668706d0f52654fe64c0ca41a96113aeab8d2b8 (patch)
tree73e78e1ea3d39206e39870bbe0af17d6c430fb51 /sshbuf.h
parent2cd7929250cf9e9f658d70dcd452f529ba08c942 (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.h')
-rw-r--r--sshbuf.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/sshbuf.h b/sshbuf.h
index 1dd9be45c..4561c0637 100644
--- a/sshbuf.h
+++ b/sshbuf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshbuf.h,v 1.2 2014/06/10 21:46:11 dtucker Exp $ */ 1/* $OpenBSD: sshbuf.h,v 1.3 2014/06/24 01:13:21 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2011 Damien Miller 3 * Copyright (c) 2011 Damien Miller
4 * 4 *
@@ -216,9 +216,12 @@ int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g);
216int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); 216int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v);
217#endif 217#endif
218 218
219/* Dump the contents of the buffer to stderr in a human-readable format */ 219/* Dump the contents of the buffer in a human-readable format */
220void sshbuf_dump(struct sshbuf *buf, FILE *f); 220void sshbuf_dump(struct sshbuf *buf, FILE *f);
221 221
222/* Dump specified memory in a human-readable format */
223void sshbuf_dump_data(const void *s, size_t len, FILE *f);
224
222/* Return the hexadecimal representation of the contents of the buffer */ 225/* Return the hexadecimal representation of the contents of the buffer */
223char *sshbuf_dtob16(struct sshbuf *buf); 226char *sshbuf_dtob16(struct sshbuf *buf);
224 227