diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
| commit | acc1a9ef8333c798c210fa94be6af4d5fe2dd794 (patch) | |
| tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/ssh-pkcs11-helper.c | |
| parent | 62ee4b69cd038bc55efbaeb27454ef07d39831b3 (diff) | |
| parent | ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 (diff) | |
| download | src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.tar.gz src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.zip | |
Upgrade to OpenSSH 7.2p2.
Notes
Notes:
svn path=/head/; revision=296633
Diffstat (limited to 'crypto/openssh/ssh-pkcs11-helper.c')
| -rw-r--r-- | crypto/openssh/ssh-pkcs11-helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/ssh-pkcs11-helper.c b/crypto/openssh/ssh-pkcs11-helper.c index f2d586395472..53f41c555f40 100644 --- a/crypto/openssh/ssh-pkcs11-helper.c +++ b/crypto/openssh/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); |