diff options
author | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 08:04:02 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 08:04:02 +1000 |
commit | b9609fd86c623d6d440e630f5f9a63295f7aea20 (patch) | |
tree | 22d3cc7196f064df906653ae62a8726437b9b6f7 | |
parent | a54a040f66944c6e8913df8635a01a2327219be9 (diff) |
- (dtucker) [sshbuf.h] Only declare ECC functions if building without
OpenSSL or if OpenSSL has ECC.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | sshbuf.h | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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. @@ -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); |