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 /sshd.c | |
| parent | 4ca6a1fac328477c642329676d6469dba59019a3 (diff) | |
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 'sshd.c')
| -rw-r--r-- | sshd.c | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.568 2021/01/27 09:26:54 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.569 2021/01/27 10:05:28 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -205,13 +205,6 @@ struct { static volatile sig_atomic_t received_sighup = 0; static volatile sig_atomic_t received_sigterm = 0; -/* session identifier, used by RSA-auth */ -u_char session_id[16]; - -/* same for ssh2 */ -u_char *session_id2 = NULL; -u_int session_id2_len = 0; - /* record remote hostname or ip */ u_int utmp_len = HOST_NAME_MAX+1; @@ -2398,9 +2391,6 @@ do_ssh2_kex(struct ssh *ssh) ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &kex->done); - session_id2 = kex->session_id; - session_id2_len = kex->session_id_len; - #ifdef DEBUG_KEXDH /* send 1st encrypted/maced/compressed message */ if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 || |