[ssh-keygen.c]
     uint32_t -> u_int32_t for consistency; ok djm@
This commit is contained in:
Darren Tucker 2005-06-01 23:02:25 +10:00
parent fc4f2dd347
commit 2db8ae671e
2 changed files with 6 additions and 3 deletions

View File

@ -10,6 +10,9 @@
must be a target directory), kill the spawned ssh child before exiting. must be a target directory), kill the spawned ssh child before exiting.
This stops it trying to authenticate and spewing lots of output. This stops it trying to authenticate and spewing lots of output.
deraadt@ ok deraadt@ ok
- dtucker@cvs.openbsd.org 2005/05/26 09:08:12
[ssh-keygen.c]
uint32_t -> u_int32_t for consistency; ok djm@
20050531 20050531
- (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at
@ -2658,4 +2661,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.3805 2005/06/01 13:01:12 dtucker Exp $ $Id: ChangeLog,v 1.3806 2005/06/01 13:02:25 dtucker Exp $

View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.125 2005/05/24 02:05:09 avsm Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.126 2005/05/26 09:08:12 dtucker Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -1008,7 +1008,7 @@ 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; u_int32_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;