summaryrefslogtreecommitdiffstats
path: root/ssh-add.1
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-11-07 09:38:38 +0100
committerDamien Miller <djm@mindrot.org>2019-11-08 04:09:32 +0100
commitaa4c640dc362816d63584a16e786d5e314e24390 (patch)
treeff9a6015ea0de5579d49d66d42590d93887fd7aa /ssh-add.1
parentPut sftp-realpath in libssh.a (diff)
downloadopenssh-aa4c640dc362816d63584a16e786d5e314e24390.tar.xz
openssh-aa4c640dc362816d63584a16e786d5e314e24390.zip
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.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 9b90257b4..73b91d945 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.71 2019/11/01 00:52:35 jmc Exp $
+.\" $OpenBSD: ssh-add.1,v 1.72 2019/11/07 08:38:38 naddy Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" 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
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 1 2019 $
+.Dd $Mdocdate: November 7 2019 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@@ -63,6 +63,7 @@ When run without arguments, it adds the files
.Pa ~/.ssh/id_rsa ,
.Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa ,
+.Pa ~/.ssh/id_ecdsa_sk ,
and
.Pa ~/.ssh/id_ed25519 .
After loading a private key,
@@ -135,7 +136,7 @@ Be quiet after a successful operation.
.It Fl S Ar provider
Specifies a path to a security key provider library that will be used when
adding any security key-hosted keys, overriding the default of using the
-.Ev "SSH_SK_PROVIDER"
+.Ev SSH_SK_PROVIDER
environment variable to specify a provider.
.It Fl s Ar pkcs11
Add keys provided by the PKCS#11 shared library
@@ -205,6 +206,8 @@ hardware security keys.
Contains the DSA authentication identity of the user.
.It Pa ~/.ssh/id_ecdsa
Contains the ECDSA authentication identity of the user.
+.It Pa ~/.ssh/id_ecdsa_sk
+Contains the security key-hosted ECDSA authentication identity of the user.
.It Pa ~/.ssh/id_ed25519
Contains the Ed25519 authentication identity of the user.
.It Pa ~/.ssh/id_rsa