summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-11-18 23:16:49 +0000
committerDamien Miller <djm@mindrot.org>2019-11-20 09:27:29 +1100
commitf0edda81c5ebccffcce52b182c3033531a1aab71 (patch)
tree7e12495cd4902d1d2611d4a5f8d9eb3cbc87e426 /ssh.1
parent189550f5bc85148e85f4caa1f6b2fc623149a4ee (diff)
downloadopenssh-git-f0edda81c5ebccffcce52b182c3033531a1aab71.tar.gz
upstream: more missing mentions of ed25519-sk; ok djm@
OpenBSD-Commit-ID: f242e53366f61697dffd53af881bc5daf78230ff
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.113
1 files changed, 10 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 2268c197..1ce0864c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.405 2019/11/14 21:27:30 djm Exp $
-.Dd $Mdocdate: November 14 2019 $
+.\" $OpenBSD: ssh.1,v 1.406 2019/11/18 23:16:49 naddy Exp $
+.Dd $Mdocdate: November 18 2019 $
.Dt SSH 1
.Os
.Sh NAME
@@ -280,7 +280,8 @@ The default is
.Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk ,
-.Pa ~/.ssh/id_ed25519
+.Pa ~/.ssh/id_ed25519 ,
+.Pa ~/.ssh/id_ed25519_sk
and
.Pa ~/.ssh/id_rsa .
Identity files may also be specified on
@@ -901,6 +902,8 @@ This stores the private key in
(security key-hosted ECDSA),
.Pa ~/.ssh/id_ed25519
(Ed25519),
+.Pa ~/.ssh/id_ed25519_sk
+(security key-hosted Ed25519),
or
.Pa ~/.ssh/id_rsa
(RSA)
@@ -913,6 +916,8 @@ and stores the public key in
(security key-hosted ECDSA),
.Pa ~/.ssh/id_ed25519.pub
(Ed25519),
+.Pa ~/.ssh/id_ed25519_sk.pub
+(security key-hosted Ed25519),
or
.Pa ~/.ssh/id_rsa.pub
(RSA)
@@ -1491,6 +1496,7 @@ above.
.It Pa ~/.ssh/id_ecdsa
.It Pa ~/.ssh/id_ecdsa_sk
.It Pa ~/.ssh/id_ed25519
+.It Pa ~/.ssh/id_ed25519_sk
.It Pa ~/.ssh/id_rsa
Contains the private key for authentication.
These files
@@ -1506,6 +1512,7 @@ sensitive part of this file using AES-128.
.It Pa ~/.ssh/id_ecdsa.pub
.It Pa ~/.ssh/id_ecdsa_sk.pub
.It Pa ~/.ssh/id_ed25519.pub
+.It Pa ~/.ssh/id_ed25519_sk.pub
.It Pa ~/.ssh/id_rsa.pub
Contains the public key for authentication.
These files are not