diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-04 08:26:52 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-04 08:26:52 +1100 |
commit | 1e1242604eb0fd510fe93f81245c529237ffc513 (patch) | |
tree | d15eb5e9442cd3d812d6ade20775864f1600825a /Makefile.in | |
parent | d2252c79191d069372ed6effce7c7a2de93448cd (diff) |
- markus@cvs.openbsd.org 2013/11/02 21:59:15
[kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
use curve25519 for default key exchange (curve25519-sha256@libssh.org);
initial patch from Aris Adamantiadis; ok djm@
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 92c95a928..797aa3e0c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.341 2013/11/03 21:26:53 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -73,7 +73,7 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ | 74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ |
75 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | 75 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
76 | jpake.o schnorr.o ssh-pkcs11.o krl.o | 76 | jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o |
77 | 77 | ||
78 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 78 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
79 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 79 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |