summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 22:56:46 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 22:56:46 +0000
commitff2866cf5198be7669423641538bb910080ee029 (patch)
tree559dcfd4ae78e758b65d6f8e8fdb2d234f0d7f19
parent958d9f695b78a03645cb9b426855c291355b7091 (diff)
- (bal) ssh-keyscan double -lssh hack due to seed_rng().
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.in4
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 45b74fd5..86775205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,7 +98,7 @@
[ssh-keygen.c]
allow uploading RSA keys for non-default AUT0 (sha1 over passphrase
like sectok).
- - markus@cvs.openbsd.org 2001/08/01 23:38:45
+ - markus@cvs.openbsd.org 2001/08/01 23:38:45
[scard.c ssh.c]
support finish rsa keys.
free public keys after login -> call finish -> close smartcard.
@@ -122,7 +122,7 @@
- jakob@cvs.openbsd.org 2001/08/02 15:43:57
[ssh-agent.c ssh.c ssh-keygen.c]
add /* SMARTCARD */ to #else/#endif. ok markus@
- - jakob@cvs.openbsd.org 2001/08/02 16:14:05
+ - jakob@cvs.openbsd.org 2001/08/02 16:14:05
[scard.c ssh-agent.c ssh.c ssh-keygen.c]
clean up some /* SMARTCARD */. ok markus@
- mpech@cvs.openbsd.org 2001/08/02 18:37:35
@@ -147,6 +147,7 @@
- stevesk@cvs.openbsd.org 2001/08/06 19:47:05
[scp.c]
use alarm vs. setitimer for portable; ok markus@
+ - (bal) ssh-keyscan double -lssh hack due to seed_rng().
20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6257,4 +6258,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1465 2001/08/06 22:48:19 mouring Exp $
+$Id: ChangeLog,v 1.1466 2001/08/06 22:56:46 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index 37488531..223a3660 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.183 2001/07/25 16:24:34 mouring Exp $
+# $Id: Makefile.in,v 1.184 2001/08/06 22:56:46 mouring Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -111,7 +111,7 @@ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
- $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+ $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)