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)
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 2268c197f..1ce0864c7 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.405 2019/11/14 21:27:30 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.406 2019/11/18 23:16:49 naddy Exp $
37.Dd $Mdocdate: November 14 2019 $ 37.Dd $Mdocdate: November 18 2019 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -280,7 +280,8 @@ The default is
280.Pa ~/.ssh/id_dsa , 280.Pa ~/.ssh/id_dsa ,
281.Pa ~/.ssh/id_ecdsa , 281.Pa ~/.ssh/id_ecdsa ,
282.Pa ~/.ssh/id_ecdsa_sk , 282.Pa ~/.ssh/id_ecdsa_sk ,
283.Pa ~/.ssh/id_ed25519 283.Pa ~/.ssh/id_ed25519 ,
284.Pa ~/.ssh/id_ed25519_sk
284and 285and
285.Pa ~/.ssh/id_rsa . 286.Pa ~/.ssh/id_rsa .
286Identity files may also be specified on 287Identity files may also be specified on
@@ -901,6 +902,8 @@ This stores the private key in
901(security key-hosted ECDSA), 902(security key-hosted ECDSA),
902.Pa ~/.ssh/id_ed25519 903.Pa ~/.ssh/id_ed25519
903(Ed25519), 904(Ed25519),
905.Pa ~/.ssh/id_ed25519_sk
906(security key-hosted Ed25519),
904or 907or
905.Pa ~/.ssh/id_rsa 908.Pa ~/.ssh/id_rsa
906(RSA) 909(RSA)
@@ -913,6 +916,8 @@ and stores the public key in
913(security key-hosted ECDSA), 916(security key-hosted ECDSA),
914.Pa ~/.ssh/id_ed25519.pub 917.Pa ~/.ssh/id_ed25519.pub
915(Ed25519), 918(Ed25519),
919.Pa ~/.ssh/id_ed25519_sk.pub
920(security key-hosted Ed25519),
916or 921or
917.Pa ~/.ssh/id_rsa.pub 922.Pa ~/.ssh/id_rsa.pub
918(RSA) 923(RSA)
@@ -1491,6 +1496,7 @@ above.
1491.It Pa ~/.ssh/id_ecdsa 1496.It Pa ~/.ssh/id_ecdsa
1492.It Pa ~/.ssh/id_ecdsa_sk 1497.It Pa ~/.ssh/id_ecdsa_sk
1493.It Pa ~/.ssh/id_ed25519 1498.It Pa ~/.ssh/id_ed25519
1499.It Pa ~/.ssh/id_ed25519_sk
1494.It Pa ~/.ssh/id_rsa 1500.It Pa ~/.ssh/id_rsa
1495Contains the private key for authentication. 1501Contains the private key for authentication.
1496These files 1502These files
@@ -1506,6 +1512,7 @@ sensitive part of this file using AES-128.
1506.It Pa ~/.ssh/id_ecdsa.pub 1512.It Pa ~/.ssh/id_ecdsa.pub
1507.It Pa ~/.ssh/id_ecdsa_sk.pub 1513.It Pa ~/.ssh/id_ecdsa_sk.pub
1508.It Pa ~/.ssh/id_ed25519.pub 1514.It Pa ~/.ssh/id_ed25519.pub
1515.It Pa ~/.ssh/id_ed25519_sk.pub
1509.It Pa ~/.ssh/id_rsa.pub 1516.It Pa ~/.ssh/id_rsa.pub
1510Contains the public key for authentication. 1517Contains the public key for authentication.
1511These files are not 1518These files are not