diff options
| author | Damien Miller <djm@mindrot.org> | 2010-09-10 03:39:26 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-09-10 03:39:26 +0200 |
| commit | 6af914a15c0c33e8b5bab5ca61919b8562ff1db9 (patch) | |
| tree | b87546d8a88a05e6fd600cbb2b8c0b132278cb10 /kexecdhs.c | |
| parent | - djm@cvs.openbsd.org 2010/09/09 10:45:45 (diff) | |
| download | openssh-6af914a15c0c33e8b5bab5ca61919b8562ff1db9.tar.xz openssh-6af914a15c0c33e8b5bab5ca61919b8562ff1db9.zip | |
- (djm) [authfd.c authfile.c bufec.c buffer.h configure.ac kex.h kexecdh.c]
[kexecdhc.c kexecdhs.c key.c key.h myproposal.h packet.c readconf.c]
[ssh-agent.c ssh-ecdsa.c ssh-keygen.c ssh.c] Disable ECDH and ECDSA on
platforms that don't have the requisite OpenSSL support. ok dtucker@
Diffstat (limited to 'kexecdhs.c')
| -rw-r--r-- | kexecdhs.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index e49a0ef37..d2c3feb09 100644 --- a/kexecdhs.c +++ b/kexecdhs.c @@ -30,8 +30,6 @@ #include <string.h> #include <signal.h> -#include <openssl/ecdh.h> - #include "xmalloc.h" #include "buffer.h" #include "key.h" @@ -46,6 +44,10 @@ #endif #include "monitor_wrap.h" +#ifdef OPENSSL_HAS_ECC + +#include <openssl/ecdh.h> + void kexecdh_server(Kex *kex) { @@ -161,3 +163,10 @@ kexecdh_server(Kex *kex) BN_clear_free(shared_secret); kex_finish(kex); } +#else /* OPENSSL_HAS_ECC */ +void +kexecdh_server(Kex *kex) +{ + fatal("ECC support is not enabled"); +} +#endif /* OPENSSL_HAS_ECC */ |