diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2019-03-05 16:17:12 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-03-08 14:58:30 +1100 |
| commit | c13b74530f9f1d9df7aeae012004b31b2de4438e (patch) | |
| tree | 4fae1ee42d4501977faaef7bf3de1a0944ea7753 | |
| parent | e9552d6043db7cd170ac6ba1b4d2c7a5eb2c3201 (diff) | |
upstream: PKCS#11 support is no longer limited to RSA; ok benno@
kn@
OpenBSD-Commit-ID: 1a9bec64d530aed5f434a960e7515a3e80cbc826
| -rw-r--r-- | ssh-keygen.1 | 6 | ||||
| -rw-r--r-- | ssh.1 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 0c284a295..124456577 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: ssh-keygen.1,v 1.156 2019/01/23 04:51:02 djm Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.157 2019/03/05 16:17:12 naddy 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 |
| @@ -35,7 +35,7 @@ | |||
| 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 37 | .\" | 37 | .\" |
| 38 | .Dd $Mdocdate: January 23 2019 $ | 38 | .Dd $Mdocdate: March 5 2019 $ |
| 39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
| 40 | .Os | 40 | .Os |
| 41 | .Sh NAME | 41 | .Sh NAME |
| @@ -279,7 +279,7 @@ Requests changing the comment in the private and public key files. | |||
| 279 | The program will prompt for the file containing the private keys, for | 279 | The program will prompt for the file containing the private keys, for |
| 280 | the passphrase if the key has one, and for the new comment. | 280 | the passphrase if the key has one, and for the new comment. |
| 281 | .It Fl D Ar pkcs11 | 281 | .It Fl D Ar pkcs11 |
| 282 | Download the RSA public keys provided by the PKCS#11 shared library | 282 | Download the public keys provided by the PKCS#11 shared library |
| 283 | .Ar pkcs11 . | 283 | .Ar pkcs11 . |
| 284 | When used in combination with | 284 | When used in combination with |
| 285 | .Fl s , | 285 | .Fl s , |
| @@ -33,8 +33,8 @@ | |||
| 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 35 | .\" | 35 | .\" |
| 36 | .\" $OpenBSD: ssh.1,v 1.400 2019/01/22 11:51:25 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.401 2019/03/05 16:17:12 naddy Exp $ |
| 37 | .Dd $Mdocdate: January 22 2019 $ | 37 | .Dd $Mdocdate: March 5 2019 $ |
| 38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -270,8 +270,8 @@ on the master process. | |||
| 270 | .It Fl I Ar pkcs11 | 270 | .It Fl I Ar pkcs11 |
| 271 | Specify the PKCS#11 shared library | 271 | Specify the PKCS#11 shared library |
| 272 | .Nm | 272 | .Nm |
| 273 | should use to communicate with a PKCS#11 token providing the user's | 273 | should use to communicate with a PKCS#11 token providing keys for user |
| 274 | private RSA key. | 274 | authentication. |
| 275 | .Pp | 275 | .Pp |
| 276 | .It Fl i Ar identity_file | 276 | .It Fl i Ar identity_file |
| 277 | Selects a file from which the identity (private key) for | 277 | Selects a file from which the identity (private key) for |