summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-02-15 09:47:49 +0000
committerDamien Miller <djm@mindrot.org>2016-02-16 10:44:00 +1100
commitffb1e7e896139a42ceb78676f637658f44612411 (patch)
treeaba9407fda7b5ee62e4562c79886450f7125f593 /ssh-keysign.c
parentef39e8c0497ff0564990a4f9e8b7338b3ba3507c (diff)
downloadopenssh-git-ffb1e7e896139a42ceb78676f637658f44612411.tar.gz
upstream commit
Add a function to enable security-related malloc_options. With and ok deraadt@, something similar has been in the snaps for a while. Upstream-ID: 43a95523b832b7f3b943d2908662191110c380ed
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r--ssh-keysign.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 1d49861a..ac5034de 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.51 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.52 2016/02/15 09:47:49 dtucker Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -182,6 +182,7 @@ main(int argc, char **argv)
u_int32_t rnd[256];
#endif
+ ssh_malloc_init(); /* must be called before any mallocs */
if (pledge("stdio rpath getpw dns id", NULL) != 0)
fatal("%s: pledge: %s", __progname, strerror(errno));