diff options
| author | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
| commit | bb6f58c772c321121b8148fe7726de90f90e1dec (patch) | |
| tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/ssh-pkcs11-helper.c | |
| parent | 0e0b4ac1f05aada737d7d2280ab40c6b06016981 (diff) | |
| parent | 9169dee5c46ff1d9dfce5c97590347e20a54c84e (diff) | |
| download | FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.zip FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.tar.gz | |
Upgrade to OpenSSH 7.2p2.
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 f2d5863..53f41c5 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); |
