summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-05 18:53:42 +1000
committerDamien Miller <djm@mindrot.org>2003-06-05 18:53:42 +1000
commitf49078dfdfaaaa323fa133a3e97c4b7f88510163 (patch)
treec7e5ce66a3c20ea5a6196daba052e7a84766d59b
parentc28e38d23a3d074e02c1f63b64569a31d499a0e8 (diff)
- (djm) Bug #588 - Add scard-opensc.o back to Makefile.in
Patch from larsch@trustcenter.de
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 25fd59145..3fa476dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 Proceedings of USENIX Security Symposium 2002 6 Proceedings of USENIX Security Symposium 2002
7 - (djm) Don't use xmalloc() or pull in toplevel headers in fake-* code 7 - (djm) Don't use xmalloc() or pull in toplevel headers in fake-* code
8 - (djm) Merge all the openbsd/fake-* into fake-rfc2553.[ch] 8 - (djm) Merge all the openbsd/fake-* into fake-rfc2553.[ch]
9 - (djm) Bug #588 - Add scard-opensc.o back to Makefile.in
10 Patch from larsch@trustcenter.de
9 11
1020030604 1220030604
11 - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from 13 - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
@@ -467,4 +469,4 @@
467 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 469 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
468 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 470 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
469 471
470$Id: ChangeLog,v 1.2785 2003/06/05 08:52:48 djm Exp $ 472$Id: ChangeLog,v 1.2786 2003/06/05 08:53:42 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 33058a828..4252ae6f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.237 2003/05/18 10:53:59 djm Exp $ 1# $Id: Makefile.in,v 1.238 2003/06/05 08:53:43 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@
@@ -68,7 +68,7 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
68 key.o dispatch.o kex.o mac.o uuencode.o misc.o \ 68 key.o dispatch.o kex.o mac.o uuencode.o misc.o \
69 rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \ 69 rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
70 kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ 70 kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
71 entropy.o 71 entropy.o scard-opensc.o
72 72
73SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ 73SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
74 sshconnect.o sshconnect1.o sshconnect2.o 74 sshconnect.o sshconnect1.o sshconnect2.o