From de4feb6b395315a413dee3c3cf13d950f2416b56 Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 26 May 2005 02:19:39 +0000 Subject: [PATCH] - avsm@cvs.openbsd.org 2005/05/24 02:05:09 [ssh-keygen.c] some style nits from dmiller@, and use a fatal() instead of a printf()/exit --- ChangeLog | 3 +++ ssh-keygen.c | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ab291d7..115014bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,9 @@ [cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5] add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes; ok markus@ + - avsm@cvs.openbsd.org 2005/05/24 02:05:09 + [ssh-keygen.c] + some style nits from dmiller@, and use a fatal() instead of a printf()/exit 20050524 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] diff --git a/ssh-keygen.c b/ssh-keygen.c index bee43124..05c8f01e 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.124 2005/05/23 22:44:01 avsm Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.125 2005/05/24 02:05:09 avsm Exp $"); #include #include @@ -1008,15 +1008,15 @@ main(int ac, char **av) struct passwd *pw; struct stat st; int opt, type, fd, download = 0; - uint32_t memory = 0, generator_wanted = 0, trials = 100; + uint32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; int log_level = SYSLOG_LEVEL_INFO; BIGNUM *start = NULL; FILE *f; + const char *errstr; extern int optind; extern char *optarg; - const char *errstr; __progname = ssh_get_progname(av[0]); @@ -1042,10 +1042,9 @@ main(int ac, char **av) switch (opt) { case 'b': bits = strtonum(optarg, 512, 32768, &errstr); - if (errstr) { - printf("Bits has bad value %s (%s)\n", optarg, errstr); - exit(1); - } + if (errstr) + fatal("Bits has bad value %s (%s)", + optarg, errstr); break; case 'F': find_host = 1; -- 2.45.2