upstream commit

small refactor and add some convenience functions; ok
 markus

1 files changed, 6 insertions, 3 deletions

diff --git a/sshkey.h b/sshkey.h
index 7217f8875..62c1c3e2f 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.4 2015/01/13 07:39:19 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.5 2015/01/26 02:59:11 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -160,10 +160,13 @@ int		 sshkey_names_valid2(const char *, int);
 char            *key_alg_list(int, int);
 
 int      sshkey_from_blob(const u_char *, size_t, struct sshkey **);
-int      sshkey_to_blob_buf(const struct sshkey *, struct sshbuf *);
+int      sshkey_fromb(struct sshbuf *, struct sshkey **);
+int      sshkey_froms(struct sshbuf *, struct sshkey **);
 int      sshkey_to_blob(const struct sshkey *, u_char **, size_t *);
-int      sshkey_plain_to_blob_buf(const struct sshkey *, struct sshbuf *);
+int      sshkey_putb(const struct sshkey *, struct sshbuf *);
+int      sshkey_puts(const struct sshkey *, struct sshbuf *);
 int      sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *);
+int      sshkey_putb_plain(const struct sshkey *, struct sshbuf *);
 
 int      sshkey_sign(const struct sshkey *, u_char **, size_t *,
     const u_char *, size_t, u_int);