diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.1 | 31 |
2 files changed, 12 insertions, 25 deletions
@@ -28,6 +28,10 @@ | |||
28 | clarify tun(4) opening - set the mode and bring the interface up. also | 28 | clarify tun(4) opening - set the mode and bring the interface up. also |
29 | (re)sets the tun(4) layer 2 LINK0 flag for existing tunnel interfaces. | 29 | (re)sets the tun(4) layer 2 LINK0 flag for existing tunnel interfaces. |
30 | suggested and ok by djm@ | 30 | suggested and ok by djm@ |
31 | - jmc@cvs.openbsd.org 2006/01/02 12:31:06 | ||
32 | [ssh.1] | ||
33 | start to cut some duplicate info from FILES; | ||
34 | help/ok djm | ||
31 | 35 | ||
32 | 20060101 | 36 | 20060101 |
33 | - (djm) [Makefile.in configure.ac includes.h misc.c] | 37 | - (djm) [Makefile.in configure.ac includes.h misc.c] |
@@ -3618,4 +3622,4 @@ | |||
3618 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3622 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3619 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3623 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3620 | 3624 | ||
3621 | $Id: ChangeLog,v 1.4070 2006/01/02 12:41:21 djm Exp $ | 3625 | $Id: ChangeLog,v 1.4071 2006/01/02 12:41:37 djm Exp $ |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.234 2005/12/31 13:45:19 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.235 2006/01/02 12:31:06 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -1061,38 +1061,21 @@ in | |||
1061 | See | 1061 | See |
1062 | .Xr sshd 8 . | 1062 | .Xr sshd 8 . |
1063 | .It Pa ~/.ssh/identity, ~/.ssh/id_dsa, ~/.ssh/id_rsa | 1063 | .It Pa ~/.ssh/identity, ~/.ssh/id_dsa, ~/.ssh/id_rsa |
1064 | Contains the authentication identity of the user. | 1064 | Contains the private key for authentication. |
1065 | They are for protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively. | ||
1066 | These files | 1065 | These files |
1067 | contain sensitive data and should be readable by the user but not | 1066 | contain sensitive data and should be readable by the user but not |
1068 | accessible by others (read/write/execute). | 1067 | accessible by others (read/write/execute). |
1069 | Note that | ||
1070 | .Nm | 1068 | .Nm |
1071 | ignores a private key file if it is accessible by others. | 1069 | will simply ignore a private key file if it is accessible by others. |
1072 | It is possible to specify a passphrase when | 1070 | It is possible to specify a passphrase when |
1073 | generating the key; the passphrase will be used to encrypt the | 1071 | generating the key which will be used to encrypt the |
1074 | sensitive part of this file using 3DES. | 1072 | sensitive part of this file using 3DES. |
1075 | .It Pa ~/.ssh/identity.pub, ~/.ssh/id_dsa.pub, ~/.ssh/id_rsa.pub | 1073 | .It Pa ~/.ssh/identity.pub, ~/.ssh/id_dsa.pub, ~/.ssh/id_rsa.pub |
1076 | Contains the public key for authentication (public part of the | 1074 | Contains the public key for authentication. |
1077 | identity file in human-readable form). | ||
1078 | The contents of the | ||
1079 | .Pa ~/.ssh/identity.pub | ||
1080 | file should be added to the file | ||
1081 | .Pa ~/.ssh/authorized_keys | ||
1082 | on all machines | ||
1083 | where the user wishes to log in using protocol version 1 RSA authentication. | ||
1084 | The contents of the | ||
1085 | .Pa ~/.ssh/id_dsa.pub | ||
1086 | and | ||
1087 | .Pa ~/.ssh/id_rsa.pub | ||
1088 | file should be added to | ||
1089 | .Pa ~/.ssh/authorized_keys | ||
1090 | on all machines | ||
1091 | where the user wishes to log in using protocol version 2 DSA/RSA authentication. | ||
1092 | These files are not | 1075 | These files are not |
1093 | sensitive and can (but need not) be readable by anyone. | 1076 | sensitive and can (but need not) be readable by anyone. |
1094 | These files are | 1077 | They are |
1095 | never used automatically and are not necessary; they are only provided for | 1078 | never used automatically and are not necessary: they are only provided for |
1096 | the convenience of the user. | 1079 | the convenience of the user. |
1097 | .It Pa ~/.ssh/config | 1080 | .It Pa ~/.ssh/config |
1098 | This is the per-user configuration file. | 1081 | This is the per-user configuration file. |