Attachment #1468 for bug #1371

View | Details | Raw Unified | Return to bug 1371 | Differences between

and this patch




.Sh SYNOPSIS
.Nm ssh
.Op Fl 1246AaCfgKkMNnqsTtVvXxY
.Op Fl # Ar provider_info
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
.Oo Fl D\ \&

.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl # Ar provider_info
Add all keys of PKC#11 provider,
.Ar provider_info
format:
.Pp
lib[:prot_auth[:private_mode[:cert_is_private]]]
.Pp
.Bl -tag -width Ds -compact
.It prot_auth
1 to allow protected mode authentication.
.It private_mode:
.Bl -tag -width Ds -compact
.It 0
determine automatically
.It 1
perform sign
.It 2
perform sign recover
.It 4
perform decrypt
.It 8
perform unwrap
.El
.It cert_is_private
1 if login is required to access certificate objects.
.El
.It Fl 1
Forces
.Nm

Lines 46-57 Link Here

(-)ssh.org/ssh-add.1 (+42 lines)
46	.Sh SYNOPSIS	46	.Sh SYNOPSIS
47	.Nm ssh-add	47	.Nm ssh-add
48	.Op Fl cDdLlXx	48	.Op Fl cDdLlXx
		49	.Op Fl K Ar provider_info
49	.Op Fl t Ar life	50	.Op Fl t Ar life
50	.Op Ar	51	.Op Ar
51	.Nm ssh-add	52	.Nm ssh-add
52	.Fl s Ar reader	53	.Fl s Ar reader
53	.Nm ssh-add	54	.Nm ssh-add
54	.Fl e Ar reader	55	.Fl e Ar reader
		56	.Nm ssh-add
		57	.Fl I Ar pkcs11_id Op Ar session_cache Op Ar cert_file
55	.Sh DESCRIPTION	58	.Sh DESCRIPTION
56	.Nm	59	.Nm
57	adds RSA or DSA identities to the authentication agent,	60	adds RSA or DSA identities to the authentication agent,
Lines 104-109 and retry. Link Here
104	.It Fl e Ar reader	107	.It Fl e Ar reader
105	Remove key in smartcard	108	Remove key in smartcard
106	.Ar reader .	109	.Ar reader .
		110	.It Fl I
		111	Add PKCS#11 key, the format of remaining arguments is:
		112	.Pp
		113	pkcs11_id [session_cache [cert_file]]
		114	.Pp
		115	.Bl -tag -width Ds -compact
		116	.It pkcs11_id
		117	Serialized id, get from ssh-keygen \-K.
		118	.It session_cache
		119	Session cache timeout in seconds \-1 for infinite.
		120	.It cert_file
		121	Specify PEM file to load if token is unavailable.
		122	.El
		123	.It Fl K Ar provider_info
		124	Add PKC#11 provider to the agent,
		125	.Ar provider_info
		126	format:
		127	.Pp
		128	lib[:prot_auth[:private_mode[:cert_is_private]]]
		129	.Pp
		130	.Bl -tag -width Ds -compact
		131	.It prot_auth
		132	1 to allow protected mode authentication.
		133	.It private_mode:
		134	.Bl -tag -width Ds -compact
		135	.It 0
		136	determine automatically
		137	.It 1
		138	perform sign
		139	.It 2
		140	perform sign recover
		141	.It 4
		142	perform decrypt
		143	.It 8
		144	perform unwrap
		145	.El
		146	.It cert_is_private
		147	1 if login is required to access certificate objects.
		148	.El
107	.It Fl L	149	.It Fl L
108	Lists public key parameters of all identities currently represented	150	Lists public key parameters of all identities currently represented
109	by the agent.	151	by the agent.

Lines 87-92 Link Here

(-)ssh.org/ssh-keygen.1 (+28 lines)
87	.Fl H	87	.Fl H
88	.Op Fl f Ar known_hosts_file	88	.Op Fl f Ar known_hosts_file
89	.Nm ssh-keygen	89	.Nm ssh-keygen
		90	.Fl K Ar provider_info
		91	.Nm ssh-keygen
90	.Fl R Ar hostname	92	.Fl R Ar hostname
91	.Op Fl f Ar known_hosts_file	93	.Op Fl f Ar known_hosts_file
92	.Nm ssh-keygen	94	.Nm ssh-keygen
Lines 256-261 also reads the Link Here
256	RFC 4716 SSH Public Key File Format.	258	RFC 4716 SSH Public Key File Format.
257	This option allows importing keys from several commercial	259	This option allows importing keys from several commercial
258	SSH implementations.	260	SSH implementations.
		261	.It Fl K Ar provider_info
		262	Show PKC#11 provider ids,
		263	.Ar provider_info
		264	format:
		265	.Pp
		266	lib[:prot_auth[:private_mode[:cert_is_private]]]
		267	.Pp
		268	.Bl -tag -width Ds -compact
		269	.It prot_auth
		270	1 to allow protected mode authentication.
		271	.It private_mode:
		272	.Bl -tag -width Ds -compact
		273	.It 0
		274	determine automatically
		275	.It 1
		276	perform sign
		277	.It 2
		278	perform sign recover
		279	.It 4
		280	perform decrypt
		281	.It 8
		282	perform unwrap
		283	.El
		284	.It cert_is_private
		285	1 if login is required to access certificate objects.
		286	.El
259	.It Fl l	287	.It Fl l
260	Show fingerprint of specified public key file.	288	Show fingerprint of specified public key file.
261	Private RSA1 keys are also supported.	289	Private RSA1 keys are also supported.

Return to bug 1371

Lines 44-49 Link Here

(-)ssh.org/ssh.1 (+27 lines)
44	.Sh SYNOPSIS	44	.Sh SYNOPSIS
45	.Nm ssh	45	.Nm ssh
46	.Op Fl 1246AaCfgKkMNnqsTtVvXxY	46	.Op Fl 1246AaCfgKkMNnqsTtVvXxY
		47	.Op Fl # Ar provider_info
47	.Op Fl b Ar bind_address	48	.Op Fl b Ar bind_address
48	.Op Fl c Ar cipher_spec	49	.Op Fl c Ar cipher_spec
49	.Oo Fl D\ \&	50	.Oo Fl D\ \&
Lines 110-115 it is executed on the remote host instea Link Here
110	.Pp	111	.Pp
111	The options are as follows:	112	The options are as follows:
112	.Bl -tag -width Ds	113	.Bl -tag -width Ds
		114	.It Fl # Ar provider_info
		115	Add all keys of PKC#11 provider,
		116	.Ar provider_info
		117	format:
		118	.Pp
		119	lib[:prot_auth[:private_mode[:cert_is_private]]]
		120	.Pp
		121	.Bl -tag -width Ds -compact
		122	.It prot_auth
		123	1 to allow protected mode authentication.
		124	.It private_mode:
		125	.Bl -tag -width Ds -compact
		126	.It 0
		127	determine automatically
		128	.It 1
		129	perform sign
		130	.It 2
		131	perform sign recover
		132	.It 4
		133	perform decrypt
		134	.It 8
		135	perform unwrap
		136	.El
		137	.It cert_is_private
		138	1 if login is required to access certificate objects.
		139	.El
113	.It Fl 1	140	.It Fl 1
114	Forces	141	Forces
115	.Nm	142	.Nm