diff options
| author | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
| commit | faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch) | |
| tree | 1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/kex.c | |
| parent | 0918f176a2a27c20190030f7d90050e0b1a8e25c (diff) | |
| download | FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz | |
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/kex.c')
| -rw-r--r-- | crypto/openssh/kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index 8280b80..6c7b20c 100644 --- a/crypto/openssh/kex.c +++ b/crypto/openssh/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 $ */ /* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -690,8 +690,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) |
