diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-04 04:23:00 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-04 04:29:37 +0100 |
| commit | 8a8183474c41bd6cebaa917346b549af2239ba2f (patch) | |
| tree | 559bb2f22c3c3463923274dd604c06363d7bffe5 /packet.c | |
| parent | upstream: static on global vars, const on handler tables that contain (diff) | |
| download | openssh-8a8183474c41bd6cebaa917346b549af2239ba2f.tar.xz openssh-8a8183474c41bd6cebaa917346b549af2239ba2f.zip | |
upstream: fix memory leak of ciphercontext when rekeying; bz#2942
Patch from Markus Schmidt; ok markus@
OpenBSD-Commit-ID: 7877f1b82e249986f1ef98d0ae76ce987d332bdd
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.278 2018/12/27 03:25:25 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.279 2019/01/04 03:23:00 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -862,8 +862,6 @@ ssh_set_newkeys(struct ssh *ssh, int mode) (unsigned long long)state->p_read.blocks, (unsigned long long)state->p_send.bytes, (unsigned long long)state->p_send.blocks); - cipher_free(*ccp); - *ccp = NULL; kex_free_newkeys(state->newkeys[mode]); state->newkeys[mode] = NULL; } @@ -882,6 +880,8 @@ ssh_set_newkeys(struct ssh *ssh, int mode) } mac->enabled = 1; DBG(debug("cipher_init_context: %d", mode)); + cipher_free(*ccp); + *ccp = NULL; if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len, enc->iv, enc->iv_len, crypt_type)) != 0) return r; |