summaryrefslogtreecommitdiffstats
path: root/ssh_api.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2021-01-27 11:05:28 +0100
committerDamien Miller <djm@mindrot.org>2021-01-27 11:10:57 +0100
commit39be3dc209f28f9c1ebfeba42adde8963b01e1cd (patch)
treed40c854a19626434deaf3b6e1706517ae234827f /ssh_api.c
parentupstream: remove global variable used to stash compat flags and use the (diff)
downloadopenssh-39be3dc209f28f9c1ebfeba42adde8963b01e1cd.tar.xz
openssh-39be3dc209f28f9c1ebfeba42adde8963b01e1cd.zip
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 'ssh_api.c')
-rw-r--r--ssh_api.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ssh_api.c b/ssh_api.c
index 8d65bdaec..bceff0f0c 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh_api.c,v 1.25 2021/01/27 09:26:54 djm Exp $ */
+/* $OpenBSD: ssh_api.c,v 1.26 2021/01/27 10:05:28 djm Exp $ */
/*
* Copyright (c) 2012 Markus Friedl. All rights reserved.
*
@@ -60,10 +60,6 @@ int mm_sshkey_sign(struct sshkey *, u_char **, u_int *,
DH *mm_choose_dh(int, int, int);
#endif
-/* Define these two variables here so that they are part of the library */
-u_char *session_id2 = NULL;
-u_int session_id2_len = 0;
-
int
mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int *lenp,
const u_char *data, u_int datalen, const char *alg,