Imported Upstream version 6.2p2

[platform/upstream/openssh.git] / myproposal.h

diff --git a/myproposal.h b/myproposal.h
index 0bc1c77..99d0934 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.28 2011/08/02 01:22:11 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -73,21 +73,30 @@
 #define        KEX_DEFAULT_ENCRYPT \
        "aes128-ctr,aes192-ctr,aes256-ctr," \
        "arcfour256,arcfour128," \
+       "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \
        "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
        "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
 #ifdef HAVE_EVP_SHA256
 #define        SHA2_HMAC_MODES \
        "hmac-sha2-256," \
-       "hmac-sha2-256-96," \
-       "hmac-sha2-512," \
-       "hmac-sha2-512-96,"
+       "hmac-sha2-512,"
 #else
 # define SHA2_HMAC_MODES
 #endif
 #define        KEX_DEFAULT_MAC \
+       "hmac-md5-etm@openssh.com," \
+       "hmac-sha1-etm@openssh.com," \
+       "umac-64-etm@openssh.com," \
+       "umac-128-etm@openssh.com," \
+       "hmac-sha2-256-etm@openssh.com," \
+       "hmac-sha2-512-etm@openssh.com," \
+       "hmac-ripemd160-etm@openssh.com," \
+       "hmac-sha1-96-etm@openssh.com," \
+       "hmac-md5-96-etm@openssh.com," \
        "hmac-md5," \
        "hmac-sha1," \
        "umac-64@openssh.com," \
+       "umac-128@openssh.com," \
        SHA2_HMAC_MODES \
        "hmac-ripemd160," \
        "hmac-ripemd160@openssh.com," \