diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-02-15 09:47:49 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-02-15 09:47:49 +0000 |
| commit | e2395bfa04c44e5d75a338a4c3333a183b5bda50 (patch) | |
| tree | fa4f8a11f1c9ba7f6acddb5b5acdf94ba8758f48 /usr.bin/ssh/ssh.c | |
| parent | To archive a 101 character absolute path in ustar format we must (diff) | |
| download | wireguard-openbsd-e2395bfa04c44e5d75a338a4c3333a183b5bda50.tar.xz wireguard-openbsd-e2395bfa04c44e5d75a338a4c3333a183b5bda50.zip | |
Add a function to enable security-related malloc_options. With and ok
deraadt@, something similar has been in the snaps for a while.
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 1215d720576..f7d6fa00717 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.435 2016/01/14 16:17:40 markus Exp $ */ +/* $OpenBSD: ssh.c,v 1.436 2016/02/15 09:47:49 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -512,6 +512,7 @@ main(int ac, char **av) struct ssh_digest_ctx *md; u_char conn_hash[SSH_DIGEST_MAX_LENGTH]; + ssh_malloc_init(); /* must be called before any mallocs */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); |