diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 14:24:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 14:24:09 +1000 |
commit | 1f0311c7c7d10c94ff7f823de9c5b2ed79368b14 (patch) | |
tree | ae708c2a25f84a04bcb04f2dbf3e8039e0f692bc /sshconnect2.c | |
parent | c5893785564498cea73cb60d2cf199490483e080 (diff) |
- markus@cvs.openbsd.org 2014/04/29 18:01:49
[auth.c authfd.c authfile.c bufaux.c cipher.c cipher.h hostfile.c]
[kex.c key.c mac.c monitor.c monitor_wrap.c myproposal.h packet.c]
[roaming_client.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
[ssh-pkcs11.h ssh.c sshconnect.c sshconnect2.c sshd.c]
make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index b1aa69c24..f71b7d226 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.206 2014/04/18 23:52:25 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.207 2014/04/29 18:01:49 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -205,11 +205,13 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
205 | 205 | ||
206 | /* start key exchange */ | 206 | /* start key exchange */ |
207 | kex = kex_setup(myproposal); | 207 | kex = kex_setup(myproposal); |
208 | #ifdef WITH_OPENSSL | ||
208 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 209 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
209 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 210 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; |
210 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 211 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
211 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 212 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
212 | kex->kex[KEX_ECDH_SHA2] = kexecdh_client; | 213 | kex->kex[KEX_ECDH_SHA2] = kexecdh_client; |
214 | #endif | ||
213 | kex->kex[KEX_C25519_SHA256] = kexc25519_client; | 215 | kex->kex[KEX_C25519_SHA256] = kexc25519_client; |
214 | kex->client_version_string=client_version_string; | 216 | kex->client_version_string=client_version_string; |
215 | kex->server_version_string=server_version_string; | 217 | kex->server_version_string=server_version_string; |