diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-04 22:10:38 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-04 22:10:38 +0000 |
| commit | 8a725a843d51b4fe43e9653eea5442c368290fe2 (patch) | |
| tree | fb02382127e5c2a833976ba49faaf486d482583f /myproposal.h | |
| parent | e683e7643997118ac51b18c073a6aba410c0cc3c (diff) | |
- markus@cvs.openbsd.org 2002/04/03 09:26:11
[cipher.c myproposal.h]
re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h index 1caf04a4e..62f5cfb65 100644 --- a/myproposal.h +++ b/myproposal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.14 2002/04/03 09:26:11 markus Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
| @@ -27,7 +27,7 @@ | |||
| 27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
| 28 | #define KEX_DEFAULT_ENCRYPT \ | 28 | #define KEX_DEFAULT_ENCRYPT \ |
| 29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ |
| 30 | "aes192-cbc,aes256-cbc" | 30 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se" |
| 31 | #define KEX_DEFAULT_MAC \ | 31 | #define KEX_DEFAULT_MAC \ |
| 32 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ | 32 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ |
| 33 | "hmac-ripemd160@openssh.com," \ | 33 | "hmac-ripemd160@openssh.com," \ |