diff options
author | Darren Tucker <dtucker@zip.com.au> | 2015-02-23 05:04:21 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2015-02-23 05:04:21 +1100 |
commit | f2004cd1adf34492eae0a44b1ef84e0e31b06088 (patch) | |
tree | c8173512b60c3b9719df735b9b6752bd58613fde /ssh_api.c | |
parent | 37f9220db8d1a52c75894c3de1e5f2ae5bd71b6f (diff) |
Repair for non-ECC OpenSSL.
Ifdef out the ECC parts when building with an OpenSSL that doesn't have
it.
Diffstat (limited to 'ssh_api.c')
-rw-r--r-- | ssh_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -105,7 +105,9 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
105 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | 105 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; |
106 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 106 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
107 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | 107 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; |
108 | # ifdef OPENSSL_HAS_ECC | ||
108 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; | 109 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; |
110 | # endif | ||
109 | #endif /* WITH_OPENSSL */ | 111 | #endif /* WITH_OPENSSL */ |
110 | ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_server; | 112 | ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_server; |
111 | ssh->kex->load_host_public_key=&_ssh_host_public_key; | 113 | ssh->kex->load_host_public_key=&_ssh_host_public_key; |
@@ -117,7 +119,9 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
117 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 119 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; |
118 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 120 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
119 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 121 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
122 | # ifdef OPENSSL_HAS_ECC | ||
120 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; | 123 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; |
124 | # endif | ||
121 | #endif /* WITH_OPENSSL */ | 125 | #endif /* WITH_OPENSSL */ |
122 | ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_client; | 126 | ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_client; |
123 | ssh->kex->verify_host_key =&_ssh_verify_host_key; | 127 | ssh->kex->verify_host_key =&_ssh_verify_host_key; |