diff options
| author | des <des@FreeBSD.org> | 2014-03-25 11:05:34 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-03-25 11:05:34 +0000 |
| commit | ae82763de4683ce610990c6d07ce39f518dd8505 (patch) | |
| tree | 5f5bce301eb69c1bba7123161572915c7e55375b /crypto/openssh/clientloop.c | |
| parent | 144450f3a924f7cbb9c11bfe0c90b21044097086 (diff) | |
| parent | ab9e0bc08282397f61df5d0ea89a81a2322ec040 (diff) | |
| download | FreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.zip FreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.tar.gz | |
Upgrade to OpenSSH 6.6p1.
Diffstat (limited to 'crypto/openssh/clientloop.c')
| -rw-r--r-- | crypto/openssh/clientloop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c index d4336c6..0532f1e 100644 --- a/crypto/openssh/clientloop.c +++ b/crypto/openssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */ +/* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */ /* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -551,7 +551,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) gc->cb(type, seq, gc->ctx); if (--gc->ref_count <= 0) { TAILQ_REMOVE(&global_confirms, gc, entry); - bzero(gc, sizeof(*gc)); + explicit_bzero(gc, sizeof(*gc)); free(gc); } @@ -878,7 +878,7 @@ process_cmdline(void) int cancel_port, ok; Forward fwd; - bzero(&fwd, sizeof(fwd)); + memset(&fwd, 0, sizeof(fwd)); fwd.listen_host = fwd.connect_host = NULL; leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); @@ -1763,7 +1763,7 @@ client_input_stdout_data(int type, u_int32_t seq, void *ctxt) char *data = packet_get_string(&data_len); packet_check_eom(); buffer_append(&stdout_buffer, data, data_len); - memset(data, 0, data_len); + explicit_bzero(data, data_len); free(data); } static void @@ -1773,7 +1773,7 @@ client_input_stderr_data(int type, u_int32_t seq, void *ctxt) char *data = packet_get_string(&data_len); packet_check_eom(); buffer_append(&stderr_buffer, data, data_len); - memset(data, 0, data_len); + explicit_bzero(data, data_len); free(data); } static void |
