summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2016-02-15 09:47:49 +0000
committerdtucker <dtucker@openbsd.org>2016-02-15 09:47:49 +0000
commite2395bfa04c44e5d75a338a4c3333a183b5bda50 (patch)
treefa4f8a11f1c9ba7f6acddb5b5acdf94ba8758f48 /usr.bin/ssh/ssh-add.c
parentTo archive a 101 character absolute path in ustar format we must (diff)
downloadwireguard-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-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index d45f64f4f93..c64f8d56edc 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.127 2015/12/11 02:31:47 mmcc Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.128 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
@@ -473,6 +473,7 @@ main(int argc, char **argv)
int r, i, ch, deleting = 0, ret = 0, key_only = 0;
int xflag = 0, lflag = 0, Dflag = 0;
+ 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();