RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-26 20:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [sshbuf.h] Only declare ECC functions if building without

Browse Source 
OpenSSL or if OpenSSL has ECC.
This commit is contained in:
Darren Tucker 2014-06-11 08:04:02 +10:00
parent a54a040f66
commit b9609fd86c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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.

2
sshbuf.h
View File

@ -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);