diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-12 20:17:38 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-12 20:17:38 +1000 |
commit | 78928793fb23a3a4c80ae62eca6a7826b2987690 (patch) | |
tree | add8a953ac4cf06877b91624fe7f647b17e6cf6f /ssh.h | |
parent | efb4afe0265333ce554f699c2a19ae249dd8d1b5 (diff) |
- OpenBSD CVS updates:
- [channels.c]
repair x11-fwd
- [sshconnect.c]
fix passwd prompt for ssh2, less debugging output.
- [clientloop.c compat.c dsa.c kex.c sshd.c]
less debugging output
- [kex.c kex.h sshconnect.c sshd.c]
check for reasonable public DH values
- [README.openssh2 cipher.c cipher.h compat.c compat.h readconf.c]
[readconf.h servconf.c servconf.h ssh.c ssh.h sshconnect.c sshd.c]
add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers
arcfour,3des-cbc'
- [sshd.c]
print 1.99 only if server supports both
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.30 2000/04/12 08:45:07 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.31 2000/04/12 10:17:41 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -54,14 +54,16 @@ | |||
54 | /* | 54 | /* |
55 | * Major protocol version. Different version indicates major incompatiblity | 55 | * Major protocol version. Different version indicates major incompatiblity |
56 | * that prevents communication. | 56 | * that prevents communication. |
57 | */ | 57 | * |
58 | #define PROTOCOL_MAJOR 1 | ||
59 | |||
60 | /* | ||
61 | * Minor protocol version. Different version indicates minor incompatibility | 58 | * Minor protocol version. Different version indicates minor incompatibility |
62 | * that does not prevent interoperation. | 59 | * that does not prevent interoperation. |
63 | */ | 60 | */ |
64 | #define PROTOCOL_MINOR 5 | 61 | #define PROTOCOL_MAJOR_1 1 |
62 | #define PROTOCOL_MINOR_1 5 | ||
63 | |||
64 | /* We support both SSH1 and SSH2 */ | ||
65 | #define PROTOCOL_MAJOR_2 2 | ||
66 | #define PROTOCOL_MINOR_2 0 | ||
65 | 67 | ||
66 | /* | 68 | /* |
67 | * Name for the service. The port named by this service overrides the | 69 | * Name for the service. The port named by this service overrides the |