diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 22:56:46 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 22:56:46 +0000 |
commit | ff2866cf5198be7669423641538bb910080ee029 (patch) | |
tree | 559dcfd4ae78e758b65d6f8e8fdb2d234f0d7f19 | |
parent | 958d9f695b78a03645cb9b426855c291355b7091 (diff) |
- (bal) ssh-keyscan double -lssh hack due to seed_rng().
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 4 |
2 files changed, 6 insertions, 5 deletions
@@ -98,7 +98,7 @@ | |||
98 | [ssh-keygen.c] | 98 | [ssh-keygen.c] |
99 | allow uploading RSA keys for non-default AUT0 (sha1 over passphrase | 99 | allow uploading RSA keys for non-default AUT0 (sha1 over passphrase |
100 | like sectok). | 100 | like sectok). |
101 | - markus@cvs.openbsd.org 2001/08/01 23:38:45 | 101 | - markus@cvs.openbsd.org 2001/08/01 23:38:45 |
102 | [scard.c ssh.c] | 102 | [scard.c ssh.c] |
103 | support finish rsa keys. | 103 | support finish rsa keys. |
104 | free public keys after login -> call finish -> close smartcard. | 104 | free public keys after login -> call finish -> close smartcard. |
@@ -122,7 +122,7 @@ | |||
122 | - jakob@cvs.openbsd.org 2001/08/02 15:43:57 | 122 | - jakob@cvs.openbsd.org 2001/08/02 15:43:57 |
123 | [ssh-agent.c ssh.c ssh-keygen.c] | 123 | [ssh-agent.c ssh.c ssh-keygen.c] |
124 | add /* SMARTCARD */ to #else/#endif. ok markus@ | 124 | add /* SMARTCARD */ to #else/#endif. ok markus@ |
125 | - jakob@cvs.openbsd.org 2001/08/02 16:14:05 | 125 | - jakob@cvs.openbsd.org 2001/08/02 16:14:05 |
126 | [scard.c ssh-agent.c ssh.c ssh-keygen.c] | 126 | [scard.c ssh-agent.c ssh.c ssh-keygen.c] |
127 | clean up some /* SMARTCARD */. ok markus@ | 127 | clean up some /* SMARTCARD */. ok markus@ |
128 | - mpech@cvs.openbsd.org 2001/08/02 18:37:35 | 128 | - mpech@cvs.openbsd.org 2001/08/02 18:37:35 |
@@ -147,6 +147,7 @@ | |||
147 | - stevesk@cvs.openbsd.org 2001/08/06 19:47:05 | 147 | - stevesk@cvs.openbsd.org 2001/08/06 19:47:05 |
148 | [scp.c] | 148 | [scp.c] |
149 | use alarm vs. setitimer for portable; ok markus@ | 149 | use alarm vs. setitimer for portable; ok markus@ |
150 | - (bal) ssh-keyscan double -lssh hack due to seed_rng(). | ||
150 | 151 | ||
151 | 20010803 | 152 | 20010803 |
152 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 153 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6257,4 +6258,4 @@ | |||
6257 | - Wrote replacements for strlcpy and mkdtemp | 6258 | - Wrote replacements for strlcpy and mkdtemp |
6258 | - Released 1.0pre1 | 6259 | - Released 1.0pre1 |
6259 | 6260 | ||
6260 | $Id: ChangeLog,v 1.1465 2001/08/06 22:48:19 mouring Exp $ | 6261 | $Id: ChangeLog,v 1.1466 2001/08/06 22:56:46 mouring Exp $ |
diff --git a/Makefile.in b/Makefile.in index 374885315..223a36608 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.183 2001/07/25 16:24:34 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.184 2001/08/06 22:56:46 mouring Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -111,7 +111,7 @@ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o | |||
111 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 111 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
112 | 112 | ||
113 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 113 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o |
114 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 114 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
115 | 115 | ||
116 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o | 116 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o |
117 | $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 117 | $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |