tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2005-05-26 12:19:39 +10:00
parent 3710f278ae
commit 02e754f1f0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -80,6 +80,9 @@
[cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5] [cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5]
add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes; add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes;
ok markus@ 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 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2579,4 +2582,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

13
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -1008,15 +1008,15 @@ main(int ac, char **av)
struct passwd *pw; struct passwd *pw;
struct stat st; struct stat st;
int opt, type, fd, download = 0; 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 do_gen_candidates = 0, do_screen_candidates = 0;
int log_level = SYSLOG_LEVEL_INFO; int log_level = SYSLOG_LEVEL_INFO;
BIGNUM *start = NULL; BIGNUM *start = NULL;
FILE *f; FILE *f;
const char *errstr;
extern int optind; extern int optind;
extern char *optarg; extern char *optarg;
const char *errstr;
__progname = ssh_get_progname(av[0]); __progname = ssh_get_progname(av[0]);
@ -1042,10 +1042,9 @@ main(int ac, char **av)
switch (opt) { switch (opt) {
case 'b': case 'b':
bits = strtonum(optarg, 512, 32768, &errstr); bits = strtonum(optarg, 512, 32768, &errstr);
if (errstr) { if (errstr)
printf("Bits has bad value %s (%s)\n", optarg, errstr); fatal("Bits has bad value %s (%s)",
exit(1); optarg, errstr);
}
break; break;
case 'F': case 'F':
find_host = 1; find_host = 1;