Merge 6.6p1.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/kexgexc.c b/kexgexc.c
index 629b5fbbc..355b7ba31 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.16 2014/01/25 10:12:50 dtucker Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.17 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -162,7 +162,7 @@ kexgex_client(Kex *kex)
                 fatal("kexgex_client: BN_new failed");
         if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
                 fatal("kexgex_client: BN_bin2bn failed");
-        memset(kbuf, 0, klen);
+        explicit_bzero(kbuf, klen);
         free(kbuf);
 
         if (datafellows & SSH_OLD_DHGEX)