diff options
author | Damien Miller <djm@mindrot.org> | 2005-05-26 12:19:17 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-05-26 12:19:17 +1000 |
commit | 3710f278ae76751118fb3ced2ee6e8e320b91002 (patch) | |
tree | 049c62a80c0ad073f0b20c1fd7d330d7bcadfb7d /myproposal.h | |
parent | b089fb5fe15a6b1936262a33417265f8cb9b0afb (diff) |
- djm@cvs.openbsd.org 2005/05/23 23:32:46
[cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5]
add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h index 228ed6882..2edbe1624 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.16 2004/06/13 12:53:24 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.17 2005/05/23 23:32:46 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -28,7 +28,8 @@ | |||
28 | "diffie-hellman-group1-sha1" | 28 | "diffie-hellman-group1-sha1" |
29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
30 | #define KEX_DEFAULT_ENCRYPT \ | 30 | #define KEX_DEFAULT_ENCRYPT \ |
31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |
32 | "arcfour128,arcfour256,arcfour," \ | ||
32 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \ | 33 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \ |
33 | "aes128-ctr,aes192-ctr,aes256-ctr" | 34 | "aes128-ctr,aes192-ctr,aes256-ctr" |
34 | #define KEX_DEFAULT_MAC \ | 35 | #define KEX_DEFAULT_MAC \ |