Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 3 insertions, 3 deletions

diff --git a/kex.c b/kex.c
index 49d0fc8fd..d114ee3e0 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.97 2014/01/25 20:35:37 markus Exp $ */
+/* $OpenBSD: kex.c,v 1.98 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -682,8 +682,8 @@ derive_ssh1_session_id(BIGNUM *host_modulus, BIGNUM *server_modulus,
                 fatal("%s: ssh_digest_final failed", __func__);
         memcpy(id, obuf, ssh_digest_bytes(SSH_DIGEST_MD5));
 
-        memset(nbuf, 0, sizeof(nbuf));
-        memset(obuf, 0, sizeof(obuf));
+        explicit_bzero(nbuf, sizeof(nbuf));
+        explicit_bzero(obuf, sizeof(obuf));
 }
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH)