summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-06-11 08:04:02 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-06-11 08:04:02 +1000
commitb9609fd86c623d6d440e630f5f9a63295f7aea20 (patch)
tree22d3cc7196f064df906653ae62a8726437b9b6f7
parenta54a040f66944c6e8913df8635a01a2327219be9 (diff)
- (dtucker) [sshbuf.h] Only declare ECC functions if building without
OpenSSL or if OpenSSL has ECC.
-rw-r--r--ChangeLog2
-rw-r--r--sshbuf.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3925c6055..4c9458e84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
15 [sshbuf.h] 15 [sshbuf.h]
16 Group ECC functions together to make things a little easier in -portable. 16 Group ECC functions together to make things a little easier in -portable.
17 "doesn't bother me" deraadt@ 17 "doesn't bother me" deraadt@
18 - (dtucker) [sshbuf.h] Only declare ECC functions if building without
19 OpenSSL or if OpenSSL has ECC.
18 20
1920140527 2120140527
20 - (djm) [cipher.c] Fix merge botch. 22 - (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);
209int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v); 209int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v);
210int sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v); 210int sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v);
211int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); 211int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len);
212#if !defined(WITH_OPENSSL) || defined(OPENSSL_HAS_ECC)
212int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); 213int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g);
213int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); 214int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v);
214int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g); 215int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g);
215int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); 216int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v);
217#endif
216 218
217/* Dump the contents of the buffer to stderr in a human-readable format */ 219/* Dump the contents of the buffer to stderr in a human-readable format */
218void sshbuf_dump(struct sshbuf *buf, FILE *f); 220void sshbuf_dump(struct sshbuf *buf, FILE *f);