summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnil Madhavapeddy <avsm@cvs.openbsd.org>2005-05-24 02:05:10 +0000
committerAnil Madhavapeddy <avsm@cvs.openbsd.org>2005-05-24 02:05:10 +0000
commit4e6b39188f9985d1de0b77fa88cc9c89377a1125 (patch)
tree881485912d6c7067a5305cbc7f9cd9e47517a6cd
parentd5889fcbb9b2f254788d1b213625ee2d579eb4b1 (diff)
some style nits from dmiller@, and use a fatal() instead of a printf()/exit
-rw-r--r--usr.bin/ssh/ssh-keygen.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index bab67382c6c..c0922a79f48 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/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 <openssl/evp.h>
#include <openssl/pem.h>
@@ -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;
SSLeay_add_all_algorithms();
log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
@@ -1037,10 +1037,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;