summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-03-01 02:16:47 +0000
committerDamien Miller <djm@mindrot.org>2019-03-01 13:21:29 +1100
commitde817e9dfab99473017d28cdf69e60397d00ea21 (patch)
tree94379decdd59969b3da62f1eb75d0222b176d0b6
parent95a8058c1a90a27acbb91392ba206854abc85226 (diff)
upstream: mention PKCS11Provide=none, reword a little and remove
mention of RSA keys only (since we support ECDSA now and might support others in the future). Inspired by Jakub Jelen via bz#2974 OpenBSD-Commit-ID: a92e3686561bf624ccc64ab320c96c9e9a263aa5
-rw-r--r--ssh_config.514
1 files changed, 8 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 087ca013..41262963 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.291 2019/02/23 08:20:43 djm Exp $
-.Dd $Mdocdate: February 23 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.292 2019/03/01 02:16:47 djm Exp $
+.Dd $Mdocdate: March 1 2019 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1180,11 +1180,13 @@ or
.Cm no
(the default).
.It Cm PKCS11Provider
-Specifies which PKCS#11 provider to use.
-The argument to this keyword is the PKCS#11 shared library
+Specifies which PKCS#11 provider to use or
+.Cm none
+to indicate that no provider should be used (the default).
+The argument to this keyword is a path to the PKCS#11 shared library
.Xr ssh 1
-should use to communicate with a PKCS#11 token providing the user's
-private RSA key.
+should use to communicate with a PKCS#11 token providing keys for user
+authentication.
.It Cm Port
Specifies the port number to connect on the remote host.
The default is 22.