From b9609fd86c623d6d440e630f5f9a63295f7aea20 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 11 Jun 2014 08:04:02 +1000 Subject: - (dtucker) [sshbuf.h] Only declare ECC functions if building without OpenSSL or if OpenSSL has ECC. --- ChangeLog | 2 ++ sshbuf.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3925c6055..4c9458e84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ [sshbuf.h] Group ECC functions together to make things a little easier in -portable. "doesn't bother me" deraadt@ + - (dtucker) [sshbuf.h] Only declare ECC functions if building without + OpenSSL or if OpenSSL has ECC. 20140527 - (djm) [cipher.c] Fix merge botch. diff --git a/sshbuf.h b/sshbuf.h index a3ebce3ec..1dd9be45c 100644 --- a/sshbuf.h +++ b/sshbuf.h @@ -209,10 +209,12 @@ int sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *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); +#if !defined(WITH_OPENSSL) || defined(OPENSSL_HAS_ECC) 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); +#endif /* 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