1 files changed, 4 insertions, 10 deletions

diff --git a/kex.c b/kex.c
index d5d5a9dae..15ea28b07 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.134 2017/06/13 12:13:59 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.136 2018/02/07 02:06:50 jsing Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -587,11 +587,9 @@ kex_free(struct kex *kex)
         u_int mode;
 
 #ifdef WITH_OPENSSL
-        if (kex->dh)
-                DH_free(kex->dh);
+        DH_free(kex->dh);
 #ifdef OPENSSL_HAS_ECC
-        if (kex->ec_client_key)
-                EC_KEY_free(kex->ec_client_key);
+        EC_KEY_free(kex->ec_client_key);
 #endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
         for (mode = 0; mode < MODE_MAX; mode++) {
@@ -675,9 +673,6 @@ choose_mac(struct ssh *ssh, struct sshmac *mac, char *client, char *server)
                 free(name);
                 return SSH_ERR_INTERNAL_ERROR;
         }
-        /* truncate the key */
-        if (ssh->compat & SSH_BUG_HMAC)
-                mac->key_len = 16;
         mac->name = name;
         mac->key = NULL;
         mac->enabled = 0;
@@ -866,8 +861,7 @@ kex_choose_conf(struct ssh *ssh)
         kex->dh_need = dh_need;
 
         /* ignore the next message if the proposals do not match */
-        if (first_kex_follows && !proposals_match(my, peer) &&
-            !(ssh->compat & SSH_BUG_FIRSTKEX))
+        if (first_kex_follows && !proposals_match(my, peer))
                 ssh->dispatch_skip_packets = 1;
         r = 0;
  out: