From a54a040f66944c6e8913df8635a01a2327219be9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 11 Jun 2014 07:58:35 +1000 Subject: - dtucker@cvs.openbsd.org 2014/06/10 21:46:11 [sshbuf.h] Group ECC functions together to make things a little easier in -portable. "doesn't bother me" deraadt@ --- ChangeLog | 4 ++++ sshbuf.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c04af4aa8..3925c6055 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ [sshconnect2.c] fix inverted test that caused PKCS#11 keys that were explicitly listed not to be preferred. Reported by Dirk-Willem van Gulik + - dtucker@cvs.openbsd.org 2014/06/10 21:46:11 + [sshbuf.h] + Group ECC functions together to make things a little easier in -portable. + "doesn't bother me" deraadt@ 20140527 - (djm) [cipher.c] Fix merge botch. diff --git a/sshbuf.h b/sshbuf.h index 1d7da31c7..a3ebce3ec 100644 --- a/sshbuf.h +++ b/sshbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf.h,v 1.1 2014/04/30 05:29:56 djm Exp $ */ +/* $OpenBSD: sshbuf.h,v 1.2 2014/06/10 21:46:11 dtucker Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -206,13 +206,13 @@ int sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp, */ int sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v); int sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v); -int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); -int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v); int sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v); +int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); +int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); +int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g); int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); -int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); /* Dump the contents of the buffer to stderr in a human-readable format */ void sshbuf_dump(struct sshbuf *buf, FILE *f); -- cgit v1.2.3