diff options
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index c4b50bbdf..83b2b41c8 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.62 2015/11/15 23:54:15 jmc Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.64 2016/11/30 06:54:26 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .Dd $Mdocdate: November 15 2015 $ | 37 | .Dd $Mdocdate: November 30 2016 $ |
38 | .Dt SSH-AGENT 1 | 38 | .Dt SSH-AGENT 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -46,6 +46,7 @@ | |||
46 | .Op Fl \&Dd | 46 | .Op Fl \&Dd |
47 | .Op Fl a Ar bind_address | 47 | .Op Fl a Ar bind_address |
48 | .Op Fl E Ar fingerprint_hash | 48 | .Op Fl E Ar fingerprint_hash |
49 | .Op Fl P Ar pkcs11_whitelist | ||
49 | .Op Fl t Ar life | 50 | .Op Fl t Ar life |
50 | .Op Ar command Op Ar arg ... | 51 | .Op Ar command Op Ar arg ... |
51 | .Nm ssh-agent | 52 | .Nm ssh-agent |
@@ -121,6 +122,18 @@ The default is | |||
121 | Kill the current agent (given by the | 122 | Kill the current agent (given by the |
122 | .Ev SSH_AGENT_PID | 123 | .Ev SSH_AGENT_PID |
123 | environment variable). | 124 | environment variable). |
125 | .It Fl P Ar pkcs11_whitelist | ||
126 | Specify a pattern-list of acceptable paths for PKCS#11 shared libraries | ||
127 | that may be added using the | ||
128 | .Fl s | ||
129 | option to | ||
130 | .Xr ssh-add 1 . | ||
131 | The default is to allow loading PKCS#11 libraries from | ||
132 | .Dq /usr/lib/*,/usr/local/lib/* . | ||
133 | PKCS#11 libraries that do not match the whitelist will be refused. | ||
134 | See PATTERNS in | ||
135 | .Xr ssh_config 5 | ||
136 | for a description of pattern-list syntax. | ||
124 | .It Fl s | 137 | .It Fl s |
125 | Generate Bourne shell commands on | 138 | Generate Bourne shell commands on |
126 | .Dv stdout . | 139 | .Dv stdout . |
@@ -195,7 +208,7 @@ The agent exits automatically when the command given on the command | |||
195 | line terminates. | 208 | line terminates. |
196 | .Sh FILES | 209 | .Sh FILES |
197 | .Bl -tag -width Ds | 210 | .Bl -tag -width Ds |
198 | .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt | 211 | .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid> |
199 | .Ux Ns -domain | 212 | .Ux Ns -domain |
200 | sockets used to contain the connection to the authentication agent. | 213 | sockets used to contain the connection to the authentication agent. |
201 | These sockets should only be readable by the owner. | 214 | These sockets should only be readable by the owner. |
@@ -207,11 +220,12 @@ The sockets should get automatically removed when the agent exits. | |||
207 | .Xr ssh-keygen 1 , | 220 | .Xr ssh-keygen 1 , |
208 | .Xr sshd 8 | 221 | .Xr sshd 8 |
209 | .Sh AUTHORS | 222 | .Sh AUTHORS |
210 | OpenSSH is a derivative of the original and free | 223 | .An -nosplit |
211 | ssh 1.2.12 release by Tatu Ylonen. | 224 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by |
212 | Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, | 225 | .An Tatu Ylonen . |
213 | Theo de Raadt and Dug Song | 226 | .An Aaron Campbell , Bob Beck , Markus Friedl , Niels Provos , Theo de Raadt |
214 | removed many bugs, re-added newer features and | 227 | and |
215 | created OpenSSH. | 228 | .An Dug Song |
216 | Markus Friedl contributed the support for SSH | 229 | removed many bugs, re-added newer features and created OpenSSH. |
217 | protocol versions 1.5 and 2.0. | 230 | .An Markus Friedl |
231 | contributed the support for SSH protocol versions 1.5 and 2.0. | ||