summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-10-13 00:21:27 +0000
committerDamien Miller <djm@mindrot.org>2015-10-14 03:22:09 +1100
commit179c353f564ec7ada64b87730b25fb41107babd7 (patch)
treeb95eb059d30c56e252659f269ae64cfe4eb90403 /kex.c
parent2539dce2a049a8f6bb0d44cac51f07ad48e691d3 (diff)
upstream commit
free the correct IV length, don't assume it's always the cipher blocksize; ok dtucker@ Upstream-ID: c260d9e5ec73628d9ff4b067fbb060eff5a7d298
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index 5f72f2e9f..d8793b919 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.110 2015/08/21 23:57:48 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.111 2015/10/13 00:21:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -481,7 +481,7 @@ kex_free_newkeys(struct newkeys *newkeys)
481 newkeys->enc.key = NULL; 481 newkeys->enc.key = NULL;
482 } 482 }
483 if (newkeys->enc.iv) { 483 if (newkeys->enc.iv) {
484 explicit_bzero(newkeys->enc.iv, newkeys->enc.block_size); 484 explicit_bzero(newkeys->enc.iv, newkeys->enc.iv_len);
485 free(newkeys->enc.iv); 485 free(newkeys->enc.iv);
486 newkeys->enc.iv = NULL; 486 newkeys->enc.iv = NULL;
487 } 487 }