- (stevesk) [auth1.c] fix password auth for protocol 1 when

[openssh.git] / myproposal.h

diff --git a/myproposal.h b/myproposal.h
index 18db954c588ba6251c4ca6ee7f1988c9ba26d6b7..1caf04a4eeb8826cd12b50b8935fff58aa458ef3 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $  */
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -21,11 +23,16 @@
  * (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_MAC         "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com"
-#define        KEX_DEFAULT_COMP        "zlib,none"
+#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 \
+       "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
+       "aes192-cbc,aes256-cbc"
+#define        KEX_DEFAULT_MAC \
+       "hmac-md5,hmac-sha1,hmac-ripemd160," \
+       "hmac-ripemd160@openssh.com," \
+       "hmac-sha1-96,hmac-md5-96"
+#define        KEX_DEFAULT_COMP        "none,zlib"
 #define        KEX_DEFAULT_LANG        ""