RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-29 13:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,800 Commits 69 Branches 157 Tags 27 MiB
a6680a4e35
Commit Graph

87 Commits

Author SHA1 Message Date
Damien Miller
7b1e757b28 - mk@cvs.openbsd.org 2006/05/30 11:46:38 
[ssh-add.c]
     Sync usage() with man page and reality.
     ok deraadt dtucker
 2006-06-13 13:03:34 +10:00
Damien Miller
57c30117c1 - djm@cvs.openbsd.org 2006/03/25 13:17:03 
[atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c]
     [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c]
     [auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
     [auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c]
     [buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c]
     [cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c]
     [deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c]
     [kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c]
     [mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c]
     [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c]
     [readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c]
     [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c]
     [sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
     [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c]
     Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
     Theo nuked - our scripts to sync -portable need them in the files
 2006-03-26 14:24:48 +11:00
Damien Miller
69b7203e6f - deraadt@cvs.openbsd.org 2006/03/20 17:10:19 
[auth.c key.c misc.c packet.c ssh-add.c]
     in a switch (), break after return or goto is stupid
 2006-03-26 14:02:35 +11:00
Damien Miller
b0fb6872ed - deraadt@cvs.openbsd.org 2006/03/19 18:51:18 
[atomicio.c auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c]
     [auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c]
     [auth-shadow.c auth-skey.c auth.c auth1.c auth2-chall.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c]
     [auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c]
     [canohost.c channels.c cipher-3des1.c cipher-acss.c cipher-aes.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c entropy.c fatal.c]
     [groupaccess.c hostfile.c includes.h kex.c kexdh.c kexdhc.c]
     [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c loginrec.c]
     [loginrec.h logintest.c mac.c match.c md-sha256.c md5crypt.c misc.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c]
     [nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c]
     [scard.c scp.c servconf.c serverloop.c session.c sftp-client.c]
     [sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c]
     [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
     [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c openbsd-compat/bsd-arc4random.c]
     [openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-cygwin_util.c]
     [openbsd-compat/bsd-getpeereid.c openbsd-compat/bsd-misc.c]
     [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c]
     [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c]
     RCSID() can die
 2006-03-26 00:03:21 +11:00
Damien Miller
8275fade44 - dtucker@cvs.openbsd.org 2006/03/13 10:26:52 
[authfile.c authfile.h ssh-add.c]
     Make ssh-add check file permissions before attempting to load private
     key files multiple times; it will fail anyway and this prevents confusing
     multiple prompts and warnings.  mindrot #1138, ok djm@
 2006-03-15 12:06:23 +11:00
Damien Miller
f17883e6a0 - stevesk@cvs.openbsd.org 2006/02/20 17:02:44 
[clientloop.c includes.h monitor.c progressmeter.c scp.c]
     [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
     move #include <signal.h> out of includes.h; ok markus@
 2006-03-15 11:45:54 +11:00
Darren Tucker
b736d8d829 - deraadt@cvs.openbsd.org 2005/11/12 18:37:59 
[ssh-add.c]
     space
 2005-11-22 19:37:08 +11:00
Darren Tucker
ce321d8a30 - djm@cvs.openbsd.org 2005/09/13 23:40:07 
[sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c
     scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c]
     ensure that stdio fds are attached; ok deraadt@
 2005-10-03 18:11:24 +10:00
Damien Miller
0dc1bef12d - djm@cvs.openbsd.org 2005/07/17 07:17:55 
[auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c]
     [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c]
     [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c]
     [sshconnect.c sshconnect2.c]
     knf says that a 2nd level indent is four (not three or five) spaces
 2005-07-17 17:22:45 +10:00
Darren Tucker
47eede77ed - deraadt@cvs.openbsd.org 2005/03/10 22:01:05 
[misc.c ssh-keygen.c servconf.c clientloop.c auth-options.c ssh-add.c
     monitor.c sftp-client.c bufaux.h hostfile.c ssh.c sshconnect.c channels.c
     readconf.c bufaux.c sftp.c]
     spacing
 2005-03-14 23:08:12 +11:00
Darren Tucker
ba6de952a0 - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c 
ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
   openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
   diff vs OpenBSD; ok mouring@, tested by tim@ too.
 2004-07-17 14:07:42 +10:00
Darren Tucker
e608ca2965 - djm@cvs.openbsd.org 2004/05/08 00:21:31 
[clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c
     sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h
     kill a tiny header; ok deraadt@
 2004-05-13 16:15:47 +10:00
Damien Miller
a8e06cef35 - djm@cvs.openbsd.org 2003/11/21 11:57:03 
[everything]
     unexpand and delete whitespace at EOL; ok markus@
     (done locally and RCS IDs synced)
 2003-11-21 23:48:55 +11:00
Damien Miller
59d3d5b8b4 - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
-lbroken; ok dtucker
 2003-08-22 09:34:41 +10:00
Damien Miller
80163e1b72 - markus@cvs.openbsd.org 2003/06/16 10:22:45 
[ssh-add.c]
     print out key comment on each prompt; make ssh-askpass more useable; ok djm@
 2003-06-18 20:29:18 +10:00
Damien Miller
d94f20d28e - djm@cvs.openbsd.org 2003/06/11 11:18:38 
[authfd.c authfd.h ssh-add.c ssh-agent.c]
     make agent constraints (lifetime, confirm) work with smartcard keys;
     ok markus@
 2003-06-11 22:06:33 +10:00
Damien Miller
0011138d47 - (djm) OpenBSD CVS Sync 
- markus@cvs.openbsd.org 2003/03/05 22:33:43
     [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
     [sftp-server.c ssh-add.c sshconnect2.c]
     fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@
 2003-03-10 11:21:17 +11:00
Damien Miller
6c71179f68 - markus@cvs.openbsd.org 2003/01/23 13:50:27 
[authfd.c authfd.h readpass.c ssh-add.1 ssh-add.c ssh-agent.c]
     ssh-add -c, prompt user for confirmation (using ssh-askpass) when
     private agent key is used; with djm@; test by dugsong@, djm@;
     ok deraadt@
 2003-01-24 11:36:23 +11:00
Ben Lindstrom
93576d9538 - deraadt@cvs.openbsd.org 2002/11/21 23:03:51 
[auth-krb5.c auth1.c hostfile.h monitor_wrap.c sftp-client.c sftp-int.c ssh-add.c ssh-rsa.c
      sshconnect.c]
     KNF
 2002-12-23 02:06:19 +00:00
Damien Miller
2138d152b2 - markus@cvs.openbsd.org 2002/09/19 15:51:23 
[ssh-add.c]
     typo; cd@kalkatraz.de
 2002-09-22 01:26:00 +10:00
Ben Lindstrom
3390749e4b - markus@cvs.openbsd.org 2002/06/26 14:51:33 
[ssh-add.c]
     fix exit code for -X/-x
 2002-06-27 00:21:59 +00:00
Ben Lindstrom
cb72e4f6d2 - deraadt@cvs.openbsd.org 2002/06/19 00:27:55 
[auth-bsdauth.c auth-skey.c auth1.c auth2-chall.c auth2-none.c authfd.c
      authfd.h monitor_wrap.c msg.c nchan.c radix.c readconf.c scp.c sftp.1
      ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
      ssh-keysign.c ssh.1 sshconnect.c sshconnect.h sshconnect2.c ttymodes.c
      xmalloc.h]
     KNF done automatically while reading....
 2002-06-21 00:41:51 +00:00
Ben Lindstrom
2b266b7f08 - markus@cvs.openbsd.org 2002/06/15 01:27:48 
[authfd.c authfd.h ssh-add.c ssh-agent.c]
     remove the CONSTRAIN_IDENTITY messages and introduce a new
     ADD_ID message with contraints instead. contraints can be
     only added together with the private key.
 2002-06-21 00:08:39 +00:00
Ben Lindstrom
c90f8a98ea - markus@cvs.openbsd.org 2002/06/15 00:07:38 
[authfd.c authfd.h ssh-add.c ssh-agent.c]
     fix stupid typo
 2002-06-21 00:06:54 +00:00
Ben Lindstrom
4eb4c4e1ef - markus@cvs.openbsd.org 2002/06/15 00:01:36 
[authfd.c authfd.h ssh-add.c ssh-agent.c]
     break agent key lifetime protocol and allow other contraints for key
     usage.
 2002-06-21 00:04:48 +00:00
Ben Lindstrom
1775c9c97a - stevesk@cvs.openbsd.org 2002/06/10 17:36:23 
[ssh-add.1 ssh-add.c]
     use convtime() to parse and validate key lifetime.  can now
     use '-t 2h' etc.  ok markus@ provos@
 2002-06-11 15:51:54 +00:00
Ben Lindstrom
61d328acf9 - markus@cvs.openbsd.org 2002/06/05 21:55:44 
[authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c]
     ssh-add -t life,  Set lifetime (in seconds) when adding identities;
     ok provos@
 2002-06-06 21:54:57 +00:00
Ben Lindstrom
163f3b8f6b - markus@cvs.openbsd.org 2002/06/05 20:56:39 
[ssh-add.c]
     add -x/-X to usage
 2002-06-06 21:53:11 +00:00
Ben Lindstrom
2f71704b42 - markus@cvs.openbsd.org 2002/06/05 19:57:12 
[authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c]
     ssh-add -x for lock and -X for unlocking the agent.
     todo: encrypt private keys with locked...
 2002-06-06 21:52:03 +00:00
Ben Lindstrom
ba72d30aa5 - rees@cvs.openbsd.org 2002/03/21 22:44:05 
[authfd.c authfd.h ssh-add.c ssh-agent.c ssh.c]
     Add PIN-protection for secret key.
 2002-03-22 03:51:06 +00:00
Ben Lindstrom
58b391b1bd - markus@cvs.openbsd.org 2002/03/21 10:21:20 
[ssh-add.c]
     ignore errors for nonexisting default keys in ssh-add,
     fixes http://bugzilla.mindrot.org/show_bug.cgi?id=158

Last patch was SUPPOSE to be:
   - stevesk@cvs.openbsd.org 2002/03/20 21:08:08
     [sshd.c]
     strerror() on chdir() fail; ok provos@

But it got co-mingled.  <sigh>  Flog me at will.
 2002-03-22 03:21:16 +00:00
Ben Lindstrom
6328ab3989 - markus@cvs.openbsd.org 2002/03/19 10:49:35 
[auth-krb5.c auth-rh-rsa.c auth.c cipher.c key.c misc.h packet.c session.c
      sftp-client.c sftp-glob.h sftp.c ssh-add.c ssh.c sshconnect2.c sshd.c
      ttymodes.c]
     KNF whitespace
 2002-03-22 02:54:23 +00:00
Damien Miller
43cba34b64 - markus@cvs.openbsd.org 2002/01/29 14:27:57 
[ssh-add.c]
     exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@
 2002-02-05 12:12:49 +11:00
Damien Miller
a055c25d05 - deraadt@cvs.openbsd.org 2001/12/24 07:29:43 
[ssh-add.c]
     try all listed keys.. how did this get broken?

(oops - that was me)
 2002-01-22 23:07:01 +11:00
Damien Miller
6e1057c2d7 - djm@cvs.openbsd.org 2001/12/21 10:06:43 
[ssh-add.1 ssh-add.c]
     Try all standard key files (id_rsa, id_dsa, identity) when invoked with
     no arguments; ok markus@
 2002-01-22 23:05:59 +11:00
Damien Miller
9f0f5c64bc - deraadt@cvs.openbsd.org 2001/12/19 07:18:56 
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
     [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
     [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
     [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
     [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
     [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
     [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
     [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
     basic KNF done while i was looking for something else
 2001-12-21 14:45:46 +11:00
Ben Lindstrom
569f88de04 - djm@cvs.openbsd.org 2001/10/02 08:38:50 
[ssh-add.c]
     return non-zero exit code on error; ok markus@
 2001-10-03 17:43:01 +00:00
Ben Lindstrom
ddfb1e3a89 - jakob@cvs.openbsd.org 2001/08/03 10:31:30 
[ssh-add.c ssh-agent.c ssh-keyscan.c]
     improve usage(). ok markus@
 2001-08-06 22:06:35 +00:00
Ben Lindstrom
f7db3bb64c - markus@cvs.openbsd.org 2001/08/01 22:03:33 
[authfd.c authfd.h readconf.c readconf.h scard.c scard.h ssh-add.c
      ssh-agent.c ssh.c]
     use strings instead of ints for smartcard reader ids
 2001-08-06 21:35:51 +00:00
Ben Lindstrom
44e49afae2 - markus@cvs.openbsd.org 2001/06/27 06:26:36 
[ssh-add.c]
     convert to getopt(3)
 2001-07-04 05:03:51 +00:00
Ben Lindstrom
036a6b28c9 - markus@cvs.openbsd.org 2001/06/26 04:59:59 
[authfd.c authfd.h ssh-add.c]
     initial support for smartcards in the agent
 2001-07-04 03:50:02 +00:00
Ben Lindstrom
4469723325 - markus@cvs.openbsd.org 2001/06/25 08:25:41 
[channels.c channels.h cipher.c clientloop.c compat.c compat.h
      hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c
      session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h]
     update copyright for 2001
 2001-07-04 03:32:30 +00:00
Ben Lindstrom
949974bbdb - markus@cvs.openbsd.org 2001/06/24 05:35:33 
[readpass.c readpass.h ssh-add.c sshconnect2.c ssh-keygen.c]
     switch to readpassphrase(3)
     2.7/8-stable needs readpassphrase.[ch] from libc
 2001-06-25 05:20:31 +00:00
Ben Lindstrom
bba81213b9 - itojun@cvs.openbsd.org 2001/06/23 15:12:20 
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
      canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
      hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
      readpass.c scp.c servconf.c serverloop.c session.c sftp.c
      sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
      ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
      ssh-keygen.c ssh-keyscan.c]
     more strict prototypes.  raise warning level in Makefile.inc.
     markus ok'ed
     TODO; cleanup headers
 2001-06-25 05:01:22 +00:00
Ben Lindstrom
5acb5d03ed - markus@cvs.openbsd.org 2001/06/06 23:19:35 
[ssh-add.c]
     remove debug message; Darren.Moffat@eng.sun.com
 2001-06-09 01:38:24 +00:00
Ben Lindstrom
93d1fe8112 - (bal) Add 'seed_rng()' to ssh-add.c 2001-05-06 02:57:20 +00:00
Ben Lindstrom
8a1371347b - markus@cvs.openbsd.org 2001/05/02 16:41:20 
[ssh-add.c]
     fix prompt for ssh-add.
 2001-05-02 22:40:12 +00:00
Ben Lindstrom
5eb97b6f3d - markus@cvs.openbsd.org 2001/04/18 21:57:42 
[readpass.c ssh-add.c]
     call askpass from ssh, too, based on work by roth@feep.net, ok deraadt
 2001-04-19 20:33:07 +00:00
Ben Lindstrom
7457f2af01 - markus@cvs.openbsd.org 2001/04/14 16:27:57 
[ssh-add.c]
     use clear_pass instead of xfree()
 2001-04-14 23:10:09 +00:00
Ben Lindstrom
da5d9b1225 - deraadt@cvs.openbsd.org 2001/04/14 04:31:01 
[ssh-add.c]
     do not double free
 2001-04-14 23:07:16 +00:00