upstream: save the derived session id in kex_derive_keys() rather

than making each kex method implementation do it.

from markus@ ok djm@

OpenBSD-Commit-ID: d61ade9c8d1e13f665f8663c552abff8c8a30673

1 files changed, 1 insertions, 12 deletions

diff --git a/kexecdhc.c b/kexecdhc.c
index af556dc58..2cff34347 100644
--- a/kexecdhc.c
+++ b/kexecdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhc.c,v 1.14 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: kexecdhc.c,v 1.15 2019/01/21 09:55:52 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -190,17 +190,6 @@ input_kex_ecdh_reply(int type, u_int32_t seq, struct ssh *ssh)
             hashlen, kex->hostkey_alg, ssh->compat)) != 0)
                 goto out;
 
-        /* save session id */
-        if (kex->session_id == NULL) {
-                kex->session_id_len = hashlen;
-                kex->session_id = malloc(kex->session_id_len);
-                if (kex->session_id == NULL) {
-                        r = SSH_ERR_ALLOC_FAIL;
-                        goto out;
-                }
-                memcpy(kex->session_id, hash, kex->session_id_len);
-        }
-
         if ((r = kex_derive_keys_bn(ssh, hash, hashlen, shared_secret)) == 0)
                 r = kex_send_newkeys(ssh);
  out: