summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-03-05 16:17:12 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-03-08 14:58:30 +1100
commitc13b74530f9f1d9df7aeae012004b31b2de4438e (patch)
tree4fae1ee42d4501977faaef7bf3de1a0944ea7753
parente9552d6043db7cd170ac6ba1b4d2c7a5eb2c3201 (diff)
upstream: PKCS#11 support is no longer limited to RSA; ok benno@
-rw-r--r--ssh-keygen.16
-rw-r--r--ssh.18
2 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0c284a29..12445657 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.156 2019/01/23 04:51:02 djm Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.157 2019/03/05 16:17:12 naddy Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: January 23 2019 $
+.Dd $Mdocdate: March 5 2019 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -279,7 +279,7 @@ Requests changing the comment in the private and public key files.
The program will prompt for the file containing the private keys, for
the passphrase if the key has one, and for the new comment.
.It Fl D Ar pkcs11
-Download the RSA public keys provided by the PKCS#11 shared library
+Download the public keys provided by the PKCS#11 shared library
.Ar pkcs11 .
When used in combination with
.Fl s ,
diff --git a/ssh.1 b/ssh.1
index ca4373d1..41937c61 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.400 2019/01/22 11:51:25 djm Exp $
-.Dd $Mdocdate: January 22 2019 $
+.\" $OpenBSD: ssh.1,v 1.401 2019/03/05 16:17:12 naddy Exp $
+.Dd $Mdocdate: March 5 2019 $
.Dt SSH 1
.Os
.Sh NAME
@@ -270,8 +270,8 @@ on the master process.
.It Fl I Ar pkcs11
Specify the PKCS#11 shared library
.Nm
-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.
.Pp
.It Fl i Ar identity_file
Selects a file from which the identity (private key) for