diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | sshbuf.h | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 | ||
19 | 20140527 | 21 | 20140527 |
20 | - (djm) [cipher.c] Fix merge botch. | 22 | - (djm) [cipher.c] Fix merge botch. |
@@ -209,10 +209,12 @@ int sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v); | |||
209 | int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v); | 209 | int sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v); |
210 | int sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v); | 210 | int sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v); |
211 | int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); | 211 | int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); |
212 | #if !defined(WITH_OPENSSL) || defined(OPENSSL_HAS_ECC) | ||
212 | int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); | 213 | int sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g); |
213 | int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); | 214 | int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); |
214 | int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g); | 215 | int sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g); |
215 | int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); | 216 | int 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 */ |
218 | void sshbuf_dump(struct sshbuf *buf, FILE *f); | 220 | void sshbuf_dump(struct sshbuf *buf, FILE *f); |