tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: PKCS#11 support is no longer limited to RSA; ok benno@ 

kn@

OpenBSD-Commit-ID: 1a9bec64d530aed5f434a960e7515a3e80cbc826
This commit is contained in:
naddy@openbsd.org 2019-03-05 16:17:12 +00:00 committed by Darren Tucker
parent e9552d6043
commit c13b74530f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-keygen.1
View File

@ -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> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" 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 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .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 program will prompt for the file containing the private keys, for
the passphrase if the key has one, and for the new comment. the passphrase if the key has one, and for the new comment.
.It Fl D Ar pkcs11 .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 . .Ar pkcs11 .
When used in combination with When used in combination with
.Fl s , .Fl s ,

8
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh.1,v 1.401 2019/03/05 16:17:12 naddy Exp $
.Dd $Mdocdate: January 22 2019 $ .Dd $Mdocdate: March 5 2019 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -270,8 +270,8 @@ on the master process.
.It Fl I Ar pkcs11 .It Fl I Ar pkcs11
Specify the PKCS#11 shared library Specify the PKCS#11 shared library
.Nm .Nm
should use to communicate with a PKCS#11 token providing the user's should use to communicate with a PKCS#11 token providing keys for user
private RSA key. authentication.
.Pp .Pp
.It Fl i Ar identity_file .It Fl i Ar identity_file
Selects a file from which the identity (private key) for Selects a file from which the identity (private key) for