diff options
| author |   markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
| commit | 1249177580e91cb4476836a604cfbb1fd56d87ec (patch) | |
| tree | 2c4439e34f8788b6b9ae0b0faf20fd17685253be /usr.bin/ssh/sshconnect.c | |
| parent | a bit more merge for traceroute6 stuff, and some consistency fixes; (diff) | |
| download | wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.tar.xz wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.zip | |
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 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index f01fb856e26..9ee8006e454 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.247 2014/04/01 03:34:10 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.248 2014/04/29 18:01:49 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1266,8 +1266,12 @@ ssh_login(Sensitive *sensitive, const char *orighost, ssh_kex2(host, hostaddr, port); ssh_userauth2(local_user, server_user, host, sensitive); } else { +#ifdef WITH_SSH1 ssh_kex(host, hostaddr); ssh_userauth1(local_user, server_user, host, sensitive); +#else + fatal("ssh1 is not unsupported"); +#endif } free(local_user); } |