Three commits in one (since they touch the same heavily-diverged file

repeatedly):

   - markus@cvs.openbsd.org 2014/03/25 09:40:03
     [myproposal.h]
     trimm default proposals.

     This commit removes the weaker pre-SHA2 hashes, the broken ciphers
     (arcfour), and the broken modes (CBC) from the default configuration
     (the patch only changes the default, all the modes are still available
     for the config files).

     ok djm@, reminded by tedu@ & naddy@ and discussed with many
   - deraadt@cvs.openbsd.org 2014/03/26 17:16:26
     [myproposal.h]
     The current sharing of myproposal[] between both client and server code
     makes the previous diff highly unpallatable.  We want to go in that
     direction for the server, but not for the client.  Sigh.
     Brought up by naddy.
   - markus@cvs.openbsd.org 2014/03/27 23:01:27
     [myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
     disable weak proposals in sshd, but keep them in ssh; ok djm@

1 files changed, 42 insertions, 27 deletions

diff --git a/myproposal.h b/myproposal.h
index 3a0f5aeab..94d6f7061 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.35 2013/12/06 13:39:49 markus Exp $ */
+/* $OpenBSD: myproposal.h,v 1.38 2014/03/27 23:01:27 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -69,23 +69,22 @@
 #ifdef HAVE_EVP_SHA256
 # define KEX_SHA256_METHODS \
         "diffie-hellman-group-exchange-sha256,"
-#define KEX_CURVE25519_METHODS \
-        "curve25519-sha256@libssh.org,"
 #define SHA2_HMAC_MODES \
         "hmac-sha2-256," \
         "hmac-sha2-512,"
 #else
 # define KEX_SHA256_METHODS
-# define KEX_CURVE25519_METHODS
 # define SHA2_HMAC_MODES
 #endif
 
-# define KEX_DEFAULT_KEX \
-        KEX_CURVE25519_METHODS \
+#define KEX_SERVER_KEX          \
+        "curve25519-sha256@libssh.org," \
         KEX_ECDH_METHODS \
         KEX_SHA256_METHODS \
+        "diffie-hellman-group14-sha1"
+
+#define KEX_CLIENT_KEX KEX_SERVER_KEX "," \
         "diffie-hellman-group-exchange-sha1," \
-        "diffie-hellman-group14-sha1," \
         "diffie-hellman-group1-sha1"
 
 #define KEX_DEFAULT_PK_ALG      \
@@ -102,29 +101,34 @@
 
 /* the actual algorithms */
 
-#define KEX_DEFAULT_ENCRYPT \
+#define KEX_SERVER_ENCRYPT \
         "aes128-ctr,aes192-ctr,aes256-ctr," \
-        "arcfour256,arcfour128," \
         AESGCM_CIPHER_MODES \
-        "chacha20-poly1305@openssh.com," \
+        "chacha20-poly1305@openssh.com"
+
+#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
+        "arcfour256,arcfour128," \
         "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
         "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
 
-#define KEX_DEFAULT_MAC \
-        "hmac-md5-etm@openssh.com," \
-        "hmac-sha1-etm@openssh.com," \
+#define KEX_SERVER_MAC \
         "umac-64-etm@openssh.com," \
         "umac-128-etm@openssh.com," \
         "hmac-sha2-256-etm@openssh.com," \
         "hmac-sha2-512-etm@openssh.com," \
+        "umac-64@openssh.com," \
+        "umac-128@openssh.com," \
+        "hmac-sha2-256," \
+        "hmac-sha2-512"
+
+#define KEX_CLIENT_MAC KEX_SERVER_MAC "," \
+        "hmac-md5-etm@openssh.com," \
+        "hmac-sha1-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," \
         "hmac-sha1-96," \
@@ -133,16 +137,27 @@
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
 #define KEX_DEFAULT_LANG        ""
 
+#define KEX_CLIENT \
+        KEX_CLIENT_KEX, \
+        KEX_DEFAULT_PK_ALG, \
+        KEX_CLIENT_ENCRYPT, \
+        KEX_CLIENT_ENCRYPT, \
+        KEX_CLIENT_MAC, \
+        KEX_CLIENT_MAC, \
+        KEX_DEFAULT_COMP, \
+        KEX_DEFAULT_COMP, \
+        KEX_DEFAULT_LANG, \
+        KEX_DEFAULT_LANG
 
-static char *myproposal[PROPOSAL_MAX] = {
-        KEX_DEFAULT_KEX,
-        KEX_DEFAULT_PK_ALG,
-        KEX_DEFAULT_ENCRYPT,
-        KEX_DEFAULT_ENCRYPT,
-        KEX_DEFAULT_MAC,
-        KEX_DEFAULT_MAC,
-        KEX_DEFAULT_COMP,
-        KEX_DEFAULT_COMP,
-        KEX_DEFAULT_LANG,
+#define KEX_SERVER \
+        KEX_SERVER_KEX, \
+        KEX_DEFAULT_PK_ALG, \
+        KEX_SERVER_ENCRYPT, \
+        KEX_SERVER_ENCRYPT, \
+        KEX_SERVER_MAC, \
+        KEX_SERVER_MAC, \
+        KEX_DEFAULT_COMP, \
+        KEX_DEFAULT_COMP, \
+        KEX_DEFAULT_LANG, \
         KEX_DEFAULT_LANG
-};
+