diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-18 17:46:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-18 17:46:27 +1100 |
commit | 8ba0ead6985ea14999265136b14ffd5aeec516f9 (patch) | |
tree | 1fdf16c075d97bbcbe5548ce8ec2082d04d3925c /ssh.1 | |
parent | 4f752cf71cf44bf4bc777541156c2bf56daf9ce9 (diff) |
- naddy@cvs.openbsd.org 2013/12/07 11:58:46
[ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1]
[ssh_config.5 sshd.8 sshd_config.5]
add missing mentions of ed25519; ok djm@
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -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.342 2013/11/26 12:14:54 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.343 2013/12/07 11:58:46 naddy Exp $ |
37 | .Dd $Mdocdate: November 26 2013 $ | 37 | .Dd $Mdocdate: December 7 2013 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -279,7 +279,8 @@ The default is | |||
279 | .Pa ~/.ssh/identity | 279 | .Pa ~/.ssh/identity |
280 | for protocol version 1, and | 280 | for protocol version 1, and |
281 | .Pa ~/.ssh/id_dsa , | 281 | .Pa ~/.ssh/id_dsa , |
282 | .Pa ~/.ssh/id_ecdsa | 282 | .Pa ~/.ssh/id_ecdsa , |
283 | .Pa ~/.ssh/id_ed25519 | ||
283 | and | 284 | and |
284 | .Pa ~/.ssh/id_rsa | 285 | .Pa ~/.ssh/id_rsa |
285 | for protocol version 2. | 286 | for protocol version 2. |
@@ -757,7 +758,7 @@ key pair for authentication purposes. | |||
757 | The server knows the public key, and only the user knows the private key. | 758 | The server knows the public key, and only the user knows the private key. |
758 | .Nm | 759 | .Nm |
759 | implements public key authentication protocol automatically, | 760 | implements public key authentication protocol automatically, |
760 | using one of the DSA, ECDSA or RSA algorithms. | 761 | using one of the DSA, ECDSA, ED25519 or RSA algorithms. |
761 | Protocol 1 is restricted to using only RSA keys, | 762 | Protocol 1 is restricted to using only RSA keys, |
762 | but protocol 2 may use any. | 763 | but protocol 2 may use any. |
763 | The HISTORY section of | 764 | The HISTORY section of |
@@ -784,6 +785,8 @@ This stores the private key in | |||
784 | (protocol 2 DSA), | 785 | (protocol 2 DSA), |
785 | .Pa ~/.ssh/id_ecdsa | 786 | .Pa ~/.ssh/id_ecdsa |
786 | (protocol 2 ECDSA), | 787 | (protocol 2 ECDSA), |
788 | .Pa ~/.ssh/id_ed25519 | ||
789 | (protocol 2 ED25519), | ||
787 | or | 790 | or |
788 | .Pa ~/.ssh/id_rsa | 791 | .Pa ~/.ssh/id_rsa |
789 | (protocol 2 RSA) | 792 | (protocol 2 RSA) |
@@ -794,6 +797,8 @@ and stores the public key in | |||
794 | (protocol 2 DSA), | 797 | (protocol 2 DSA), |
795 | .Pa ~/.ssh/id_ecdsa.pub | 798 | .Pa ~/.ssh/id_ecdsa.pub |
796 | (protocol 2 ECDSA), | 799 | (protocol 2 ECDSA), |
800 | .Pa ~/.ssh/id_ed25519.pub | ||
801 | (protocol 2 ED25519), | ||
797 | or | 802 | or |
798 | .Pa ~/.ssh/id_rsa.pub | 803 | .Pa ~/.ssh/id_rsa.pub |
799 | (protocol 2 RSA) | 804 | (protocol 2 RSA) |
@@ -1333,8 +1338,8 @@ secret, but the recommended permissions are read/write/execute for the user, | |||
1333 | and not accessible by others. | 1338 | and not accessible by others. |
1334 | .Pp | 1339 | .Pp |
1335 | .It Pa ~/.ssh/authorized_keys | 1340 | .It Pa ~/.ssh/authorized_keys |
1336 | Lists the public keys (DSA/ECDSA/RSA) that can be used for logging in as | 1341 | Lists the public keys (DSA, ECDSA, ED25519, RSA) |
1337 | this user. | 1342 | that can be used for logging in as this user. |
1338 | The format of this file is described in the | 1343 | The format of this file is described in the |
1339 | .Xr sshd 8 | 1344 | .Xr sshd 8 |
1340 | manual page. | 1345 | manual page. |
@@ -1356,6 +1361,7 @@ above. | |||
1356 | .It Pa ~/.ssh/identity | 1361 | .It Pa ~/.ssh/identity |
1357 | .It Pa ~/.ssh/id_dsa | 1362 | .It Pa ~/.ssh/id_dsa |
1358 | .It Pa ~/.ssh/id_ecdsa | 1363 | .It Pa ~/.ssh/id_ecdsa |
1364 | .It Pa ~/.ssh/id_ed25519 | ||
1359 | .It Pa ~/.ssh/id_rsa | 1365 | .It Pa ~/.ssh/id_rsa |
1360 | Contains the private key for authentication. | 1366 | Contains the private key for authentication. |
1361 | These files | 1367 | These files |
@@ -1370,6 +1376,7 @@ sensitive part of this file using 3DES. | |||
1370 | .It Pa ~/.ssh/identity.pub | 1376 | .It Pa ~/.ssh/identity.pub |
1371 | .It Pa ~/.ssh/id_dsa.pub | 1377 | .It Pa ~/.ssh/id_dsa.pub |
1372 | .It Pa ~/.ssh/id_ecdsa.pub | 1378 | .It Pa ~/.ssh/id_ecdsa.pub |
1379 | .It Pa ~/.ssh/id_ed25519.pub | ||
1373 | .It Pa ~/.ssh/id_rsa.pub | 1380 | .It Pa ~/.ssh/id_rsa.pub |
1374 | Contains the public key for authentication. | 1381 | Contains the public key for authentication. |
1375 | These files are not | 1382 | These files are not |
@@ -1409,6 +1416,7 @@ The file format and configuration options are described in | |||
1409 | .It Pa /etc/ssh/ssh_host_key | 1416 | .It Pa /etc/ssh/ssh_host_key |
1410 | .It Pa /etc/ssh/ssh_host_dsa_key | 1417 | .It Pa /etc/ssh/ssh_host_dsa_key |
1411 | .It Pa /etc/ssh/ssh_host_ecdsa_key | 1418 | .It Pa /etc/ssh/ssh_host_ecdsa_key |
1419 | .It Pa /etc/ssh/ssh_host_ed25519_key | ||
1412 | .It Pa /etc/ssh/ssh_host_rsa_key | 1420 | .It Pa /etc/ssh/ssh_host_rsa_key |
1413 | These files contain the private parts of the host keys | 1421 | These files contain the private parts of the host keys |
1414 | and are used for host-based authentication. | 1422 | and are used for host-based authentication. |