diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-02-15 09:47:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-02-16 10:44:00 +1100 |
commit | ffb1e7e896139a42ceb78676f637658f44612411 (patch) | |
tree | aba9407fda7b5ee62e4562c79886450f7125f593 /ssh-pkcs11-helper.c | |
parent | ef39e8c0497ff0564990a4f9e8b7338b3ba3507c (diff) | |
download | openssh-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-pkcs11-helper.c')
-rw-r--r-- | ssh-pkcs11-helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index f2d58639..53f41c55 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.11 2015/08/20 22:32:42 deraadt Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.12 2016/02/15 09:47:49 dtucker Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -280,6 +280,7 @@ main(int argc, char **argv) extern char *__progname; + ssh_malloc_init(); /* must be called before any mallocs */ TAILQ_INIT(&pkcs11_keylist); pkcs11_init(0); |