summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
committerotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
commiteedc3e89a813e007ee20d011314f613a59bb057c (patch)
tree91f31197e6edab09a4fae8689c84c9320e2be906 /usr.bin/ssh/ssh-keygen.c
parentConnectX-5 cards work too (diff)
downloadwireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.tar.xz
wireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.zip
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@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 773f2437cc1..7b949892765 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.330 2019/05/29 08:30:26 lum Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.331 2019/06/06 05:13:13 otto Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2438,7 +2438,6 @@ main(int argc, char **argv)
extern int optind;
extern char *optarg;
- ssh_malloc_init(); /* must be called before any mallocs */
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();