diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-01-31 12:33:47 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-01-31 12:33:47 +0000 |
| commit | 19ca85510bbe080af3faf5e9ae394608428ac953 (patch) | |
| tree | 117f9a26f0d949b937129ea841578bd2ba4390fa /ssh-agent.0 | |
| parent | ab4ec008e7abd1c8098428dbf9642c3685383045 (diff) | |
Vendor import of OpenSSH 7.4p1.vendor/openssh/7.4p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=313012
svn path=/vendor-crypto/openssh/7.4p1/; revision=313013; tag=vendor/openssh/7.4p1
Diffstat (limited to 'ssh-agent.0')
| -rw-r--r-- | ssh-agent.0 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0 index b6abf9b4e336..bb3c8d6055fa 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 @@ -5,7 +5,7 @@ NAME SYNOPSIS ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash] - [-t life] [command [arg ...]] + [-P pkcs11_whitelist] [-t life] [command [arg ...]] ssh-agent [-c | -s] -k DESCRIPTION @@ -46,6 +46,14 @@ DESCRIPTION -k Kill the current agent (given by the SSH_AGENT_PID environment variable). + -P pkcs11_whitelist + Specify a pattern-list of acceptable paths for PKCS#11 shared + libraries that may be added using the -s option to ssh-add(1). + The default is to allow loading PKCS#11 libraries from + M-bM-^@M-^\/usr/lib/*,/usr/local/lib/*M-bM-^@M-^]. PKCS#11 libraries that do not + match the whitelist will be refused. See PATTERNS in + ssh_config(5) for a description of pattern-list syntax. + -s Generate Bourne shell commands on stdout. This is the default if SHELL does not look like it's a csh style of shell. @@ -109,4 +117,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 6.0 November 15, 2015 OpenBSD 6.0 +OpenBSD 6.0 November 30, 2016 OpenBSD 6.0 |