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/kexc25519s.c b/kexc25519s.c
index 9ff74d912..65df18c4b 100644
--- a/kexc25519s.c
+++ b/kexc25519s.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexc25519s.c,v 1.13 2019/01/19 21:43:56 djm Exp $ */
+/* $OpenBSD: kexc25519s.c,v 1.14 2019/01/21 09:55:52 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -121,17 +121,6 @@ input_kex_c25519_init(int type, u_int32_t seq, struct ssh *ssh)
             hash, &hashlen)) < 0)
                 goto out;
 
-        /* save session id := H */
-        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);
-        }
-
         /* sign H */
         if ((r = kex->sign(ssh, server_host_private, server_host_public,
             &signature, &slen, hash, hashlen, kex->hostkey_alg)) < 0)