summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh_api.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2020-07-01 16:28:31 +0000
committermarkus <markus@openbsd.org>2020-07-01 16:28:31 +0000
commit35e6b8438c71575638e51d5d1c171a64a732597e (patch)
tree57889bd0f95eb70c5c949d92bafc642c4d869301 /usr.bin/ssh/ssh_api.c
parentSwitch to using a fixed segment for the copyin(9) functions. (diff)
downloadwireguard-openbsd-35e6b8438c71575638e51d5d1c171a64a732597e.tar.xz
wireguard-openbsd-35e6b8438c71575638e51d5d1c171a64a732597e.zip
free kex in ssh_packet_close; ok djm semarie
Diffstat (limited to 'usr.bin/ssh/ssh_api.c')
-rw-r--r--usr.bin/ssh/ssh_api.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_api.c b/usr.bin/ssh/ssh_api.c
index 7d25da36c1c..68b2c14391e 100644
--- a/usr.bin/ssh/ssh_api.c
+++ b/usr.bin/ssh/ssh_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh_api.c,v 1.19 2019/10/31 21:23:19 djm Exp $ */
+/* $OpenBSD: ssh_api.c,v 1.20 2020/07/01 16:28:31 markus Exp $ */
/*
* Copyright (c) 2012 Markus Friedl. All rights reserved.
*
@@ -146,7 +146,6 @@ ssh_free(struct ssh *ssh)
{
struct key_entry *k;
- ssh_packet_close(ssh);
/*
* we've only created the public keys variants in case we
* are a acting as a server.
@@ -161,8 +160,7 @@ ssh_free(struct ssh *ssh)
TAILQ_REMOVE(&ssh->private_keys, k, next);
free(k);
}
- if (ssh->kex)
- kex_free(ssh->kex);
+ ssh_packet_close(ssh);
free(ssh);
}