mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-29 16:54:51 +02:00
upstream commit
In the certificates section, be consistent about using "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@ Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb
This commit is contained in:
parent
8543d4ef6f
commit
05291e5288
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-keygen.1,v 1.126 2015/07/03 03:49:45 djm Exp $
|
.\" $OpenBSD: ssh-keygen.1,v 1.127 2015/08/20 19:20:06 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: July 3 2015 $
|
.Dd $Mdocdate: August 20 2015 $
|
||||||
.Dt SSH-KEYGEN 1
|
.Dt SSH-KEYGEN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -680,7 +680,7 @@ and identifying the CA key by providing its public half as an argument
|
|||||||
to
|
to
|
||||||
.Fl s :
|
.Fl s :
|
||||||
.Pp
|
.Pp
|
||||||
.Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id host_key.pub
|
.Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id user_key.pub
|
||||||
.Pp
|
.Pp
|
||||||
In all cases,
|
In all cases,
|
||||||
.Ar key_id
|
.Ar key_id
|
||||||
@ -693,7 +693,7 @@ By default, generated certificates are valid for all users or hosts.
|
|||||||
To generate a certificate for a specified set of principals:
|
To generate a certificate for a specified set of principals:
|
||||||
.Pp
|
.Pp
|
||||||
.Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub
|
.Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub
|
||||||
.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub"
|
.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain host_key.pub"
|
||||||
.Pp
|
.Pp
|
||||||
Additional limitations on the validity and use of user certificates may
|
Additional limitations on the validity and use of user certificates may
|
||||||
be specified through certificate options.
|
be specified through certificate options.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user