summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in12
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 889580e5e..3488c8215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
48 subject to change. 48 subject to change.
49 49
50 feedback and ok markus@ 50 feedback and ok markus@
51 - (djm) [Makefile.in] Add new ECC files
51 52
5220100827 5320100827
53 - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated, 54 - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated,
diff --git a/Makefile.in b/Makefile.in
index 5654d4341..bfd37d51e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.310 2010/05/12 06:51:39 dtucker Exp $ 1# $Id: Makefile.in,v 1.311 2010/08/31 12:47:15 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@
@@ -71,10 +71,10 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
71 log.o match.o md-sha256.o moduli.o nchan.o packet.o \ 71 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
72 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ 72 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
73 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ 73 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
74 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ 74 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
75 kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ 75 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
76 entropy.o gss-genr.o umac.o jpake.o schnorr.o \ 76 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
77 ssh-pkcs11.o 77 schnorr.o ssh-pkcs11.o
78 78
79SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ 79SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
80 sshconnect.o sshconnect1.o sshconnect2.o mux.o \ 80 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -86,7 +86,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
86 auth-chall.o auth2-chall.o groupaccess.o \ 86 auth-chall.o auth2-chall.o groupaccess.o \
87 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ 87 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
88 auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ 88 auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
89 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ 89 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
90 auth-krb5.o \ 90 auth-krb5.o \
91 auth2-gss.o gss-serv.o gss-serv-krb5.o \ 91 auth2-gss.o gss-serv.o gss-serv-krb5.o \
92 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ 92 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \