summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/serverloop.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
committerdes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
commitfaff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch)
tree1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/serverloop.c
parent0918f176a2a27c20190030f7d90050e0b1a8e25c (diff)
downloadFreeBSD-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/serverloop.c')
-rw-r--r--crypto/openssh/serverloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c
index 3224818..769bfec 100644
--- a/crypto/openssh/serverloop.c
+++ b/crypto/openssh/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.169 2013/12/19 00:19:12 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.170 2014/02/02 03:44:31 djm Exp $ */
/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -921,7 +921,7 @@ server_input_stdin_data(int type, u_int32_t seq, void *ctxt)
data = packet_get_string(&data_len);
packet_check_eom();
buffer_append(&stdin_buffer, data, data_len);
- memset(data, 0, data_len);
+ explicit_bzero(data, data_len);
free(data);
}
OpenPOWER on IntegriCloud