Deleted Added
full compact
ssh-add.1 (65668) ssh-add.1 (76259)
1.\" $OpenBSD: ssh-add.1,v 1.24 2001/04/10 09:13:21 itojun Exp $
2.\"
1.\" -*- nroff -*-
2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5.\" All rights reserved
6.\"
7.\" As far as I am concerned, the code I have written for this software
8.\" can be used freely for any purpose. Any derived versions of this
9.\" software must be clearly marked as such, and if the derived work is
10.\" incompatible with the protocol description in the RFC file, it must be
11.\" called by a name other than "ssh" or "Secure Shell".
12.\"
13.\"
3.\" -*- nroff -*-
4.\"
5.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
6.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
7.\" All rights reserved
8.\"
9.\" As far as I am concerned, the code I have written for this software
10.\" can be used freely for any purpose. Any derived versions of this
11.\" software must be clearly marked as such, and if the derived work is
12.\" incompatible with the protocol description in the RFC file, it must be
13.\" called by a name other than "ssh" or "Secure Shell".
14.\"
15.\"
14.\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
15.\" Copyright (c) 1999 Aaron Campbell. All rights reserved.
16.\" Copyright (c) 1999 Theo de Raadt. All rights reserved.
16.\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
17.\" Copyright (c) 1999 Aaron Campbell. All rights reserved.
18.\" Copyright (c) 1999 Theo de Raadt. All rights reserved.
17.\"
18.\" Redistribution and use in source and binary forms, with or without
19.\" modification, are permitted provided that the following conditions
20.\" are met:
21.\" 1. Redistributions of source code must retain the above copyright
22.\" notice, this list of conditions and the following disclaimer.
23.\" 2. Redistributions in binary form must reproduce the above copyright
24.\" notice, this list of conditions and the following disclaimer in the

--- 26 unchanged lines hidden (view full) ---

51.Xr ssh-agent 1 .
52When run without arguments, it adds the file
53.Pa $HOME/.ssh/identity .
54Alternative file names can be given on the command line.
55If any file requires a passphrase,
56.Nm
57asks for the passphrase from the user.
58The Passphrase it is read from the user's tty.
19.\"
20.\" Redistribution and use in source and binary forms, with or without
21.\" modification, are permitted provided that the following conditions
22.\" are met:
23.\" 1. Redistributions of source code must retain the above copyright
24.\" notice, this list of conditions and the following disclaimer.
25.\" 2. Redistributions in binary form must reproduce the above copyright
26.\" notice, this list of conditions and the following disclaimer in the

--- 26 unchanged lines hidden (view full) ---

53.Xr ssh-agent 1 .
54When run without arguments, it adds the file
55.Pa $HOME/.ssh/identity .
56Alternative file names can be given on the command line.
57If any file requires a passphrase,
58.Nm
59asks for the passphrase from the user.
60The Passphrase it is read from the user's tty.
61.Nm
62retries the last passphrase if multiple identity files are given.
59.Pp
60The authentication agent must be running and must be an ancestor of
61the current process for
62.Nm
63to work.
64.Pp
65The options are as follows:
66.Bl -tag -width Ds

--- 4 unchanged lines hidden (view full) ---

71.It Fl d
72Instead of adding the identity, removes the identity from the agent.
73.It Fl D
74Deletes all identities from the agent.
75.El
76.Sh FILES
77.Bl -tag -width Ds
78.It Pa $HOME/.ssh/identity
63.Pp
64The authentication agent must be running and must be an ancestor of
65the current process for
66.Nm
67to work.
68.Pp
69The options are as follows:
70.Bl -tag -width Ds

--- 4 unchanged lines hidden (view full) ---

75.It Fl d
76Instead of adding the identity, removes the identity from the agent.
77.It Fl D
78Deletes all identities from the agent.
79.El
80.Sh FILES
81.Bl -tag -width Ds
82.It Pa $HOME/.ssh/identity
79Contains the RSA authentication identity of the user.
83Contains the protocol version 1 RSA authentication identity of the user.
80This file should not be readable by anyone but the user.
81Note that
82.Nm
83ignores this file if it is accessible by others.
84It is possible to
85specify a passphrase when generating the key; that passphrase will be
86used to encrypt the private part of this file.
87This is the default file added by
88.Nm
89when no other files have been specified.
90.It Pa $HOME/.ssh/id_dsa
84This file should not be readable by anyone but the user.
85Note that
86.Nm
87ignores this file if it is accessible by others.
88It is possible to
89specify a passphrase when generating the key; that passphrase will be
90used to encrypt the private part of this file.
91This is the default file added by
92.Nm
93when no other files have been specified.
94.It Pa $HOME/.ssh/id_dsa
91Contains the DSA authentication identity of the user.
95Contains the protocol version 2 DSA authentication identity of the user.
96.It Pa $HOME/.ssh/id_rsa
97Contains the protocol version 2 RSA authentication identity of the user.
92.El
93.Sh ENVIRONMENT
94.Bl -tag -width Ds
95.It Ev "DISPLAY" and "SSH_ASKPASS"
96If
97.Nm
98needs a passphrase, it will read the passphrase from the current
99terminal if it was run from a terminal.

--- 11 unchanged lines hidden (view full) ---

111from a
112.Pa .Xsession
113or related script.
114(Note that on some machines it
115may be necessary to redirect the input from
116.Pa /dev/null
117to make this work.)
118.El
98.El
99.Sh ENVIRONMENT
100.Bl -tag -width Ds
101.It Ev "DISPLAY" and "SSH_ASKPASS"
102If
103.Nm
104needs a passphrase, it will read the passphrase from the current
105terminal if it was run from a terminal.

--- 11 unchanged lines hidden (view full) ---

117from a
118.Pa .Xsession
119or related script.
120(Note that on some machines it
121may be necessary to redirect the input from
122.Pa /dev/null
123to make this work.)
124.El
119.Sh AUTHOR
120Tatu Ylonen <ylo@cs.hut.fi>
121.Pp
122OpenSSH
123is a derivative of the original (free) ssh 1.2.12 release, but with bugs
124removed and newer features re-added.
125Rapidly after the 1.2.12 release,
126newer versions bore successively more restrictive licenses.
127This version of OpenSSH
128.Bl -bullet
129.It
130has all components of a restrictive nature (i.e., patents, see
131.Xr ssl 8 )
132directly removed from the source code; any licensed or patented components
133are chosen from
134external libraries.
135.It
136has been updated to support ssh protocol 1.5.
137.It
138contains added support for
139.Xr kerberos 8
140authentication and ticket passing.
141.It
142supports one-time password authentication with
143.Xr skey 1 .
144.El
125.Sh AUTHORS
126OpenSSH is a derivative of the original and free
127ssh 1.2.12 release by Tatu Ylonen.
128Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
129Theo de Raadt and Dug Song
130removed many bugs, re-added newer features and
131created OpenSSH.
132Markus Friedl contributed the support for SSH
133protocol versions 1.5 and 2.0.
145.Sh SEE ALSO
146.Xr ssh 1 ,
147.Xr ssh-agent 1 ,
148.Xr ssh-keygen 1 ,
134.Sh SEE ALSO
135.Xr ssh 1 ,
136.Xr ssh-agent 1 ,
137.Xr ssh-keygen 1 ,
149.Xr sshd 8 ,
150.Xr ssl 8
138.Xr sshd 8