upstream commit

free the correct IV length, don't assume it's always the
 cipher blocksize; ok dtucker@

Upstream-ID: c260d9e5ec73628d9ff4b067fbb060eff5a7d298

diff --git a/kex.c b/kex.c
index 5f72f2e9f0e420a91a330a7348b4d5ab0e8a8910..d8793b91959d1cd8ffc9934909d5f7051db0b279 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.110 2015/08/21 23:57:48 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.111 2015/10/13 00:21:27 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -481,7 +481,7 @@ kex_free_newkeys(struct newkeys *newkeys)
                newkeys->enc.key = NULL;
        }
        if (newkeys->enc.iv) {
-               explicit_bzero(newkeys->enc.iv, newkeys->enc.block_size);
+               explicit_bzero(newkeys->enc.iv, newkeys->enc.iv_len);
                free(newkeys->enc.iv);
                newkeys->enc.iv = NULL;
        }