diff options
| author | otto@openbsd.org <otto@openbsd.org> | 2019-06-06 07:13:13 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-07 16:25:42 +0200 |
| commit | 0323d9b619d512f80c57575b810a05791891f657 (patch) | |
| tree | 6bde14513c6fe9ff37d069325ee6baac112b6b60 /ssh-pkcs11-helper.c | |
| parent | upstream: fix ssh-keysign fd handling problem introduced in r1.304 (diff) | |
| download | openssh-0323d9b619d512f80c57575b810a05791891f657.tar.xz openssh-0323d9b619d512f80c57575b810a05791891f657.zip | |
upstream: Replace calls to ssh_malloc_init() by a static init of
malloc_options. Prepares for changes in the way malloc is initialized. ok
guenther@ dtucker@
OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
Diffstat (limited to 'ssh-pkcs11-helper.c')
| -rw-r--r-- | ssh-pkcs11-helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index cb873e20b..cd79db2ae 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.18 2019/05/16 08:47:27 dtucker Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.19 2019/06/06 05:13:13 otto Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -322,7 +322,6 @@ main(int argc, char **argv) extern char *__progname; struct pollfd pfd[2]; - ssh_malloc_init(); /* must be called before any mallocs */ __progname = ssh_get_progname(argv[0]); seed_rng(); TAILQ_INIT(&pkcs11_keylist); |