diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
tree | a65f45e0073cb55ad42957a36b4636ff21405108 /cipher.h | |
parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) |
- OpenBSD CVS update
- markus@cvs.openbsd.org
[cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
[ssh.h sshconnect1.c sshconnect2.c sshd.8]
- complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
- hugh@cvs.openbsd.org
[ssh.1]
- zap typo
[ssh-keygen.1]
- One last nit fix. (markus approved)
[sshd.8]
- some markus certified spelling adjustments
- markus@cvs.openbsd.org
[auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
[sshconnect2.c ]
- bug compat w/ ssh-2.0.13 x11, split out bugs
[nchan.c]
- no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
[ssh-keygen.c]
- handle escapes in real and original key format, ok millert@
[version.h]
- OpenSSH-2.1
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$Id: cipher.h,v 1.12 2000/04/16 02:31:50 damien Exp $"); */ | 14 | /* RCSID("$Id: cipher.h,v 1.13 2000/05/09 01:03:00 damien Exp $"); */ |
15 | 15 | ||
16 | #ifndef CIPHER_H | 16 | #ifndef CIPHER_H |
17 | #define CIPHER_H | 17 | #define CIPHER_H |
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | /* Cipher types. New types can be added, but old types should not be removed | 24 | /* Cipher types. New types can be added, but old types should not be removed |
25 | for compatibility. The maximum allowed value is 31. */ | 25 | for compatibility. The maximum allowed value is 31. */ |
26 | #define SSH_CIPHER_ILLEGAL -2 /* No valid cipher selected. */ | ||
26 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ | 27 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ |
27 | #define SSH_CIPHER_NONE 0 /* no encryption */ | 28 | #define SSH_CIPHER_NONE 0 /* no encryption */ |
28 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ | 29 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ |