diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2019-11-07 08:38:38 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-08 14:09:32 +1100 |
commit | aa4c640dc362816d63584a16e786d5e314e24390 (patch) | |
tree | ff9a6015ea0de5579d49d66d42590d93887fd7aa /ssh-add.1 | |
parent | b236b27d6dada7f0542214003632b4e9b7aa1380 (diff) |
upstream: Fill in missing man page bits for U2F security key support:
Mention the new key types, the ~/.ssh/id_ecdsa_sk file, ssh's
SecurityKeyProvider keyword, the SSH_SK_PROVIDER environment variable,
and ssh-keygen's new -w and -x options.
Copy the ssh-sk-helper man page from ssh-pkcs11-helper with minimal
substitutions.
ok djm@
OpenBSD-Commit-ID: ef2e8f83d0c0ce11ad9b8c28945747e5ca337ac4
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.71 2019/11/01 00:52:35 jmc Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.72 2019/11/07 08:38:38 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: November 1 2019 $ | 38 | .Dd $Mdocdate: November 7 2019 $ |
39 | .Dt SSH-ADD 1 | 39 | .Dt SSH-ADD 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -63,6 +63,7 @@ When run without arguments, it adds the files | |||
63 | .Pa ~/.ssh/id_rsa , | 63 | .Pa ~/.ssh/id_rsa , |
64 | .Pa ~/.ssh/id_dsa , | 64 | .Pa ~/.ssh/id_dsa , |
65 | .Pa ~/.ssh/id_ecdsa , | 65 | .Pa ~/.ssh/id_ecdsa , |
66 | .Pa ~/.ssh/id_ecdsa_sk , | ||
66 | and | 67 | and |
67 | .Pa ~/.ssh/id_ed25519 . | 68 | .Pa ~/.ssh/id_ed25519 . |
68 | After loading a private key, | 69 | After loading a private key, |
@@ -135,7 +136,7 @@ Be quiet after a successful operation. | |||
135 | .It Fl S Ar provider | 136 | .It Fl S Ar provider |
136 | Specifies a path to a security key provider library that will be used when | 137 | Specifies a path to a security key provider library that will be used when |
137 | adding any security key-hosted keys, overriding the default of using the | 138 | adding any security key-hosted keys, overriding the default of using the |
138 | .Ev "SSH_SK_PROVIDER" | 139 | .Ev SSH_SK_PROVIDER |
139 | environment variable to specify a provider. | 140 | environment variable to specify a provider. |
140 | .It Fl s Ar pkcs11 | 141 | .It Fl s Ar pkcs11 |
141 | Add keys provided by the PKCS#11 shared library | 142 | Add keys provided by the PKCS#11 shared library |
@@ -205,6 +206,8 @@ hardware security keys. | |||
205 | Contains the DSA authentication identity of the user. | 206 | Contains the DSA authentication identity of the user. |
206 | .It Pa ~/.ssh/id_ecdsa | 207 | .It Pa ~/.ssh/id_ecdsa |
207 | Contains the ECDSA authentication identity of the user. | 208 | Contains the ECDSA authentication identity of the user. |
209 | .It Pa ~/.ssh/id_ecdsa_sk | ||
210 | Contains the security key-hosted ECDSA authentication identity of the user. | ||
208 | .It Pa ~/.ssh/id_ed25519 | 211 | .It Pa ~/.ssh/id_ed25519 |
209 | Contains the Ed25519 authentication identity of the user. | 212 | Contains the Ed25519 authentication identity of the user. |
210 | .It Pa ~/.ssh/id_rsa | 213 | .It Pa ~/.ssh/id_rsa |