diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-01-27 10:05:28 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-01-27 21:10:57 +1100 |
| commit | 39be3dc209f28f9c1ebfeba42adde8963b01e1cd (patch) | |
| tree | d40c854a19626434deaf3b6e1706517ae234827f /kex.h | |
| parent | 4ca6a1fac328477c642329676d6469dba59019a3 (diff) | |
| download | openssh-git-39be3dc209f28f9c1ebfeba42adde8963b01e1cd.tar.gz | |
upstream: make ssh->kex->session_id a sshbuf instead of u_char*/size_t
and use that instead of global variables containing copies of it. feedback/ok
markus@
OpenBSD-Commit-ID: a4b1b1ca4afd2e37cb9f64f737b30a6a7f96af68
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.112 2020/12/29 00:59:15 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.113 2021/01/27 10:05:28 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -132,8 +132,6 @@ struct newkeys { struct ssh; struct kex { - u_char *session_id; - size_t session_id_len; struct newkeys *newkeys[MODE_MAX]; u_int we_need; u_int dh_need; @@ -149,6 +147,7 @@ struct kex { struct sshbuf *peer; struct sshbuf *client_version; struct sshbuf *server_version; + struct sshbuf *session_id; sig_atomic_t done; u_int flags; int hash_alg; |