RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC.

This commit is contained in:
Damien Miller 2014-08-19 11:28:11 +10:00
parent 2f3d1e7fb2
commit 8813790263
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
20140819 20140819
- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
- (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC.
20140811 20140811
- (djm) [myproposal.h] Make curve25519 KEX dependent on - (djm) [myproposal.h] Make curve25519 KEX dependent on

12
sshbuf.h
View File

@ -21,8 +21,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef WITH_OPENSSL
# include <openssl/bn.h> # include <openssl/bn.h>
# ifdef OPENSSL_HAS_ECC
# include <openssl/ec.h> # include <openssl/ec.h>
# endif /* OPENSSL_HAS_ECC */
#endif /* WITH_OPENSSL */
#define SSHBUF_SIZE_MAX 0x8000000 /* Hard maximum size */ #define SSHBUF_SIZE_MAX 0x8000000 /* Hard maximum size */
#define SSHBUF_REFS_MAX 0x100000 /* Max child buffers */ #define SSHBUF_REFS_MAX 0x100000 /* Max child buffers */
@ -204,17 +208,19 @@ int sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp,
* Functions to extract or store SSH wire encoded bignums and elliptic * Functions to extract or store SSH wire encoded bignums and elliptic
* curve points. * curve points.
*/ */
int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len);
#ifdef WITH_OPENSSL
int sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v); int sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v);
int sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v); int sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v);
int sshbuf_put_bignum2(struct sshbuf *buf, const 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_bignum1(struct sshbuf *buf, const BIGNUM *v);
int sshbuf_put_bignum2_bytes(struct sshbuf *buf, const void *v, size_t len); # ifdef OPENSSL_HAS_ECC
#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_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g);
int sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v); 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_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g);
int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v); int sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v);
#endif # endif /* OPENSSL_HAS_ECC */
#endif /* WITH_OPENSSL */
/* Dump the contents of the buffer in a human-readable format */ /* Dump the contents of the buffer in a human-readable format */
void sshbuf_dump(struct sshbuf *buf, FILE *f); void sshbuf_dump(struct sshbuf *buf, FILE *f);