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 /readconf.h | |
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 'readconf.h')
-rw-r--r-- | readconf.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/readconf.h b/readconf.h index e94213fa1..85d937d87 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: readconf.h,v 1.22 2000/10/11 20:14:39 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: readconf.h,v 1.23 2000/11/12 19:50:37 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef READCONF_H | 16 | #ifndef READCONF_H |
17 | #define READCONF_H | 17 | #define READCONF_H |
@@ -35,7 +35,7 @@ typedef struct { | |||
35 | int rhosts_rsa_authentication; /* Try rhosts with RSA | 35 | int rhosts_rsa_authentication; /* Try rhosts with RSA |
36 | * authentication. */ | 36 | * authentication. */ |
37 | int rsa_authentication; /* Try RSA authentication. */ | 37 | int rsa_authentication; /* Try RSA authentication. */ |
38 | int dsa_authentication; /* Try DSA authentication. */ | 38 | int pubkey_authentication; /* Try ssh2 pubkey authentication. */ |
39 | int skey_authentication; /* Try S/Key or TIS authentication. */ | 39 | int skey_authentication; /* Try S/Key or TIS authentication. */ |
40 | #ifdef KRB4 | 40 | #ifdef KRB4 |
41 | int kerberos_authentication; /* Try Kerberos | 41 | int kerberos_authentication; /* Try Kerberos |
@@ -78,10 +78,9 @@ typedef struct { | |||
78 | char *system_hostfile2; | 78 | char *system_hostfile2; |
79 | char *user_hostfile2; | 79 | char *user_hostfile2; |
80 | 80 | ||
81 | int num_identity_files; /* Number of files for RSA identities. */ | 81 | int num_identity_files; /* Number of files for RSA/DSA identities. */ |
82 | int num_identity_files2; /* DSA identities. */ | ||
83 | char *identity_files[SSH_MAX_IDENTITY_FILES]; | 82 | char *identity_files[SSH_MAX_IDENTITY_FILES]; |
84 | char *identity_files2[SSH_MAX_IDENTITY_FILES]; | 83 | int identity_files_type[SSH_MAX_IDENTITY_FILES]; |
85 | 84 | ||
86 | /* Local TCP/IP forward requests. */ | 85 | /* Local TCP/IP forward requests. */ |
87 | int num_local_forwards; | 86 | int num_local_forwards; |