diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
| commit | fc1ba28a5c70935b11b49532dc5eff88b382c107 (patch) | |
| tree | a7acad41e7fbc545b9d7456a0c51253a7dd802f6 /crypto/openssh/ssh-pkcs11-helper.c | |
| parent | acf8e75eb0cf3c74206957ced5dc497e438030d1 (diff) | |
| parent | 4cb2962809c63c51f6f7e029b95f2bdb622f1e4a (diff) | |
| download | src-fc1ba28a5c70935b11b49532dc5eff88b382c107.tar.gz src-fc1ba28a5c70935b11b49532dc5eff88b382c107.zip | |
Upgrade to OpenSSH 7.1p2.
Notes
Notes:
svn path=/head/; revision=294496
Diffstat (limited to 'crypto/openssh/ssh-pkcs11-helper.c')
| -rw-r--r-- | crypto/openssh/ssh-pkcs11-helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-pkcs11-helper.c b/crypto/openssh/ssh-pkcs11-helper.c index ceabc8ba7fe4..f2d586395472 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.10 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.11 2015/08/20 22:32:42 deraadt Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -301,8 +301,8 @@ main(int argc, char **argv) buffer_init(&oqueue); set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); - rset = (fd_set *)xmalloc(set_size); - wset = (fd_set *)xmalloc(set_size); + rset = xmalloc(set_size); + wset = xmalloc(set_size); for (;;) { memset(rset, 0, set_size); |