diff options
| author | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
| commit | 0bc1bd814e3c2b5e92d6f595930051960d17f47f (patch) | |
| tree | 176c7dc2844ecc2c1de0f72d221449556ffa5209 /ssh_config | |
| parent | 559d383037b0872fcde4e6c40188b649c574be74 (diff) | |
- (djm) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/06 16:04:56
[channels.c channels.h clientloop.c nchan.c serverloop.c]
[session.c ssh.c]
agent forwarding and -R for ssh2, based on work from
jhuuskon@messi.uku.fi
- markus@cvs.openbsd.org 2000/11/06 16:13:27
[ssh.c sshconnect.c sshd.c]
do not disabled rhosts(rsa) if server port > 1024; from
pekkas@netcore.fi
- markus@cvs.openbsd.org 2000/11/06 16:16:35
[sshconnect.c]
downgrade client to 1.3 if server is 1.4; help from mdb@juniper.net
- markus@cvs.openbsd.org 2000/11/09 18:04:40
[auth1.c]
typo; from mouring@pconline.com
- markus@cvs.openbsd.org 2000/11/12 12:03:28
[ssh-agent.c]
off-by-one when removing a key from the agent
- markus@cvs.openbsd.org 2000/11/12 12:50:39
[auth-rh-rsa.c auth2.c authfd.c authfd.h]
[authfile.c hostfile.c kex.c kex.h key.c key.h myproposal.h]
[readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h ssh-add.c]
[ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config]
[sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config ssh-dss.c]
[ssh-dss.h ssh-rsa.c ssh-rsa.h dsa.c dsa.h]
add support for RSA to SSH2. please test.
there are now 3 types of keys: RSA1 is used by ssh-1 only,
RSA and DSA are used by SSH2.
you can use 'ssh-keygen -t rsa -f ssh2_rsa_file' to generate RSA
keys for SSH2 and use the RSA keys for hostkeys or for user keys.
SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before.
- (djm) Fix up Makefile and Redhat init script to create RSA host keys
- (djm) Change to interim version
Diffstat (limited to 'ssh_config')
| -rw-r--r-- | ssh_config | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ssh_config b/ssh_config index cb360d04b..fdac1313c 100644 --- a/ssh_config +++ b/ssh_config | |||
| @@ -13,9 +13,9 @@ | |||
| 13 | # Site-wide defaults for various options | 13 | # Site-wide defaults for various options |
| 14 | 14 | ||
| 15 | # Host * | 15 | # Host * |
| 16 | # ForwardAgent yes | 16 | # ForwardAgent no |
| 17 | # ForwardX11 yes | 17 | # ForwardX11 no |
| 18 | # RhostsAuthentication yes | 18 | # RhostsAuthentication no |
| 19 | # RhostsRSAAuthentication yes | 19 | # RhostsRSAAuthentication yes |
| 20 | # RSAAuthentication yes | 20 | # RSAAuthentication yes |
| 21 | # PasswordAuthentication yes | 21 | # PasswordAuthentication yes |
| @@ -23,9 +23,12 @@ | |||
| 23 | # UseRsh no | 23 | # UseRsh no |
| 24 | # BatchMode no | 24 | # BatchMode no |
| 25 | # CheckHostIP yes | 25 | # CheckHostIP yes |
| 26 | # StrictHostKeyChecking no | 26 | # StrictHostKeyChecking yes |
| 27 | # IdentityFile ~/.ssh/identity | 27 | # IdentityFile ~/.ssh/identity |
| 28 | # IdentityFile ~/.ssh/id_dsa | ||
| 29 | # IdentityFile ~/.ssh/id_rsa1 | ||
| 30 | # IdentityFile ~/.ssh/id_rsa2 | ||
| 28 | # Port 22 | 31 | # Port 22 |
| 29 | # Protocol 2,1 | 32 | # Protocol 1,2 |
| 30 | # Cipher blowfish | 33 | # Cipher blowfish |
| 31 | # EscapeChar ~ | 34 | # EscapeChar ~ |