- 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
diff --git a/ChangeLog b/ChangeLog
index 0418ae5..25bac49 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]
@@ -2579,4 +2582,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3784 2005/05/26 02:19:17 djm Exp $
+$Id: ChangeLog,v 1.3785 2005/05/26 02:19:39 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index bee4312..05c8f01 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 <openssl/evp.h>
#include <openssl/pem.h>
@@ -1008,15 +1008,15 @@
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 @@
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;