- djm@cvs.openbsd.org 2003/01/10 10:29:35

[openssh.git] / myproposal.h

diff --git a/myproposal.h b/myproposal.h
index 2f1cd97cee097f003e801c63d99d87259ec522e6..62f5cfb655ec3cc83403f3daf8615521631cba7e 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: myproposal.h,v 1.12 2001/03/05 15:56:16 deraadt Exp $ */
+/*     $OpenBSD: myproposal.h,v 1.14 2002/04/03 09:26:11 markus Exp $  */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,17 +25,9 @@
  */
 #define KEX_DEFAULT_KEX                "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
 #define        KEX_DEFAULT_PK_ALG      "ssh-rsa,ssh-dss"
-#ifdef _CRAY
-/*Temporary hack until rijndael is ported to CRAY word addressable machines  */
-#define        KEX_DEFAULT_ENCRYPT \
-       "3des-cbc,blowfish-cbc,cast128-cbc,arcfour" 
-#else
 #define        KEX_DEFAULT_ENCRYPT \
        "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
-       "aes192-cbc,aes256-cbc," \
-       "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
-       "rijndael-cbc@lysator.liu.se"
-#endif
+       "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se"
 #define        KEX_DEFAULT_MAC \
        "hmac-md5,hmac-sha1,hmac-ripemd160," \
        "hmac-ripemd160@openssh.com," \