Attachment 1468 Details for Bug 1371 – 2002_all_pkcs11-mans.patch

[patch] 2002_all_pkcs11-mans.patch

2002_all_pkcs11-mans.patch (text/plain), 3.61 KB, created by Alon Bar-Lev on 2008-03-07 19:41:53 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Bar-Lev

Created: 2008-03-07 19:41:53 AEDT

Size: 3.61 KB

patch

obsolete

>[PATCH] PKCS#11 manpages updates
>
>Common for both OpenSSH and Portable OpenSSH
>
>Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
>
>---
>
>diff -urNp ssh.org/ssh.1 ssh.doc/ssh.1
>--- ssh.org/ssh.1	2007-06-12 16:43:55.000000000 +0300
>+++ ssh.doc/ssh.1	2008-01-09 14:22:53.000000000 +0200
>@@ -44,6 +44,7 @@
> .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\ \&
>@@ -110,6 +111,32 @@ it is executed on the remote host instea
> .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
>diff -urNp ssh.org/ssh-add.1 ssh.doc/ssh-add.1
>--- ssh.org/ssh-add.1	2007-06-12 16:41:03.000000000 +0300
>+++ ssh.doc/ssh-add.1	2008-01-09 14:08:00.000000000 +0200
>@@ -46,12 +46,15 @@
> .Sh SYNOPSIS
> .Nm ssh-add
> .Op Fl cDdLlXx
>+.Op Fl K Ar provider_info
> .Op Fl t Ar life
> .Op Ar
> .Nm ssh-add
> .Fl s Ar reader
> .Nm ssh-add
> .Fl e Ar reader
>+.Nm ssh-add
>+.Fl I Ar pkcs11_id Op Ar session_cache Op Ar cert_file
> .Sh DESCRIPTION
> .Nm
> adds RSA or DSA identities to the authentication agent,
>@@ -104,6 +107,45 @@ and retry.
> .It Fl e Ar reader
> Remove key in smartcard
> .Ar reader .
>+.It Fl I
>+Add PKCS#11 key, the format of remaining arguments is:
>+.Pp
>+pkcs11_id [session_cache [cert_file]]
>+.Pp
>+.Bl -tag -width Ds -compact
>+.It pkcs11_id
>+Serialized id, get from ssh-keygen \-K.
>+.It session_cache
>+Session cache timeout in seconds \-1 for infinite.
>+.It cert_file
>+Specify PEM file to load if token is unavailable.
>+.El
>+.It Fl K Ar provider_info
>+Add PKC#11 provider to the agent,
>+.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 L
> Lists public key parameters of all identities currently represented
> by the agent.
>diff -urNp ssh.org/ssh-keygen.1 ssh.doc/ssh-keygen.1
>--- ssh.org/ssh-keygen.1	2007-05-31 22:20:16.000000000 +0300
>+++ ssh.doc/ssh-keygen.1	2008-01-09 14:13:43.000000000 +0200
>@@ -87,6 +87,8 @@
> .Fl H
> .Op Fl f Ar known_hosts_file
> .Nm ssh-keygen
>+.Fl K Ar provider_info
>+.Nm ssh-keygen
> .Fl R Ar hostname
> .Op Fl f Ar known_hosts_file
> .Nm ssh-keygen
>@@ -256,6 +258,32 @@ also reads the
> RFC 4716 SSH Public Key File Format.
> This option allows importing keys from several commercial
> SSH implementations.
>+.It Fl K Ar provider_info
>+Show PKC#11 provider ids,
>+.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 l
> Show fingerprint of specified public key file.
> Private RSA1 keys are also supported.

Actions: View | Diff

Attachments on bug 1371: 1444 | 1463 | 1464 | 1465 | 1466 | 1467 | 1468 | 1469 | 1470 | 1471 | 1477 | 1478 | 1484 | 1485 | 1486 | 1487 | 1488 | 1489 | 1490 | 1491 | 1492 | 1493 | 1494 | 1495 | 1496 | 1497 | 1547 | 1557 | 1558