[BACK]Return to ssh.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh.1 between version 1.342 and 1.343

version 1.342, 2013/11/26 12:14:54 version 1.343, 2013/12/07 11:58:46
Line 279 
Line 279 
 .Pa ~/.ssh/identity  .Pa ~/.ssh/identity
 for protocol version 1, and  for protocol version 1, and
 .Pa ~/.ssh/id_dsa ,  .Pa ~/.ssh/id_dsa ,
 .Pa ~/.ssh/id_ecdsa  .Pa ~/.ssh/id_ecdsa ,
   .Pa ~/.ssh/id_ed25519
 and  and
 .Pa ~/.ssh/id_rsa  .Pa ~/.ssh/id_rsa
 for protocol version 2.  for protocol version 2.
Line 757 
Line 758 
 The server knows the public key, and only the user knows the private key.  The server knows the public key, and only the user knows the private key.
 .Nm  .Nm
 implements public key authentication protocol automatically,  implements public key authentication protocol automatically,
 using one of the DSA, ECDSA or RSA algorithms.  using one of the DSA, ECDSA, ED25519 or RSA algorithms.
 Protocol 1 is restricted to using only RSA keys,  Protocol 1 is restricted to using only RSA keys,
 but protocol 2 may use any.  but protocol 2 may use any.
 The HISTORY section of  The HISTORY section of
Line 784 
Line 785 
 (protocol 2 DSA),  (protocol 2 DSA),
 .Pa ~/.ssh/id_ecdsa  .Pa ~/.ssh/id_ecdsa
 (protocol 2 ECDSA),  (protocol 2 ECDSA),
   .Pa ~/.ssh/id_ed25519
   (protocol 2 ED25519),
 or  or
 .Pa ~/.ssh/id_rsa  .Pa ~/.ssh/id_rsa
 (protocol 2 RSA)  (protocol 2 RSA)
Line 794 
Line 797 
 (protocol 2 DSA),  (protocol 2 DSA),
 .Pa ~/.ssh/id_ecdsa.pub  .Pa ~/.ssh/id_ecdsa.pub
 (protocol 2 ECDSA),  (protocol 2 ECDSA),
   .Pa ~/.ssh/id_ed25519.pub
   (protocol 2 ED25519),
 or  or
 .Pa ~/.ssh/id_rsa.pub  .Pa ~/.ssh/id_rsa.pub
 (protocol 2 RSA)  (protocol 2 RSA)
Line 1333 
Line 1338 
 and not accessible by others.  and not accessible by others.
 .Pp  .Pp
 .It Pa ~/.ssh/authorized_keys  .It Pa ~/.ssh/authorized_keys
 Lists the public keys (DSA/ECDSA/RSA) that can be used for logging in as  Lists the public keys (DSA, ECDSA, ED25519, RSA)
 this user.  that can be used for logging in as this user.
 The format of this file is described in the  The format of this file is described in the
 .Xr sshd 8  .Xr sshd 8
 manual page.  manual page.
Line 1356 
Line 1361 
 .It Pa ~/.ssh/identity  .It Pa ~/.ssh/identity
 .It Pa ~/.ssh/id_dsa  .It Pa ~/.ssh/id_dsa
 .It Pa ~/.ssh/id_ecdsa  .It Pa ~/.ssh/id_ecdsa
   .It Pa ~/.ssh/id_ed25519
 .It Pa ~/.ssh/id_rsa  .It Pa ~/.ssh/id_rsa
 Contains the private key for authentication.  Contains the private key for authentication.
 These files  These files
Line 1370 
Line 1376 
 .It Pa ~/.ssh/identity.pub  .It Pa ~/.ssh/identity.pub
 .It Pa ~/.ssh/id_dsa.pub  .It Pa ~/.ssh/id_dsa.pub
 .It Pa ~/.ssh/id_ecdsa.pub  .It Pa ~/.ssh/id_ecdsa.pub
   .It Pa ~/.ssh/id_ed25519.pub
 .It Pa ~/.ssh/id_rsa.pub  .It Pa ~/.ssh/id_rsa.pub
 Contains the public key for authentication.  Contains the public key for authentication.
 These files are not  These files are not
Line 1409 
Line 1416 
 .It Pa /etc/ssh/ssh_host_key  .It Pa /etc/ssh/ssh_host_key
 .It Pa /etc/ssh/ssh_host_dsa_key  .It Pa /etc/ssh/ssh_host_dsa_key
 .It Pa /etc/ssh/ssh_host_ecdsa_key  .It Pa /etc/ssh/ssh_host_ecdsa_key
   .It Pa /etc/ssh/ssh_host_ed25519_key
 .It Pa /etc/ssh/ssh_host_rsa_key  .It Pa /etc/ssh/ssh_host_rsa_key
 These files contain the private parts of the host keys  These files contain the private parts of the host keys
 and are used for host-based authentication.  and are used for host-based authentication.
Legend:
Removed from v.1.342  
changed lines
  Added in v.1.343