20010115

[openssh.git] / myproposal.h

diff --git a/myproposal.h b/myproposal.h
index 18db954c588ba6251c4ca6ee7f1988c9ba26d6b7..5abb0e5a67e5a18ff7311ecb8463214a92e9a788 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -21,11 +21,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define KEX_DEFAULT_KEX                "diffie-hellman-group1-sha1"
-#define        KEX_DEFAULT_PK_ALG      "ssh-dss"
-#define        KEX_DEFAULT_ENCRYPT     "3des-cbc,blowfish-cbc,arcfour,cast128-cbc"
+#define KEX_DEFAULT_KEX                "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
+#define        KEX_DEFAULT_PK_ALG      "ssh-rsa,ssh-dss"
+#define        KEX_DEFAULT_ENCRYPT \
+       "3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
+       "aes128-cbc,aes192-cbc,aes256-cbc," \
+       "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
+       "rijndael-cbc@lysator.liu.se"
 #define        KEX_DEFAULT_MAC         "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com"
-#define        KEX_DEFAULT_COMP        "zlib,none"
+#define        KEX_DEFAULT_COMP        "none,zlib"
 #define        KEX_DEFAULT_LANG        ""