summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 09:55:52 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 21:47:28 +1100
commit5ae3f6d314465026d028af82609c1d49ad197655 (patch)
tree6fa154f6478dd9b35d90716573420f3c517c49ab /kex.c
parent7be8572b32a15d5c3dba897f252e2e04e991c307 (diff)
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
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/kex.c b/kex.c
index 30e1c261d..0d5618ecc 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.143 2018/12/27 03:25:25 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.144 2019/01/21 09:55:52 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -1009,6 +1009,14 @@ kex_derive_keys(struct ssh *ssh, u_char *hash, u_int hashlen,
1009 u_int i, j, mode, ctos; 1009 u_int i, j, mode, ctos;
1010 int r; 1010 int r;
1011 1011
1012 /* save initial hash as session id */
1013 if (kex->session_id == NULL) {
1014 kex->session_id_len = hashlen;
1015 kex->session_id = malloc(kex->session_id_len);
1016 if (kex->session_id == NULL)
1017 return SSH_ERR_ALLOC_FAIL;
1018 memcpy(kex->session_id, hash, kex->session_id_len);
1019 }
1012 for (i = 0; i < NKEYS; i++) { 1020 for (i = 0; i < NKEYS; i++) {
1013 if ((r = derive_key(ssh, 'A'+i, kex->we_need, hash, hashlen, 1021 if ((r = derive_key(ssh, 'A'+i, kex->we_need, hash, hashlen,
1014 shared_secret, &keys[i])) != 0) { 1022 shared_secret, &keys[i])) != 0) {