diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-10 20:10:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-10 20:10:25 +0000 |
| commit | ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 (patch) | |
| tree | 3d2e6235900570f05cfbdbc81f01095fa38bd1e7 /ssh-pkcs11-helper.c | |
| parent | 4cb2962809c63c51f6f7e029b95f2bdb622f1e4a (diff) | |
| download | src-ff4b04e0d6105849f2b141c035ecd92a4ebc6d97.tar.gz src-ff4b04e0d6105849f2b141c035ecd92a4ebc6d97.zip | |
Vendor import of OpenSSH 7.2p1.vendor/openssh/7.2p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=296619
svn path=/vendor-crypto/openssh/7.2p1/; revision=296620; tag=vendor/openssh/7.2p1
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 f2d586395472..53f41c555f40 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); |