From 2db8ae671eef747f97d3b50eafb525d3778c5dae Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 1 Jun 2005 23:02:25 +1000 Subject: - dtucker@cvs.openbsd.org 2005/05/26 09:08:12 [ssh-keygen.c] uint32_t -> u_int32_t for consistency; ok djm@ --- ChangeLog | 5 ++++- ssh-keygen.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 845318847..c4420926c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ must be a target directory), kill the spawned ssh child before exiting. This stops it trying to authenticate and spewing lots of output. 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 - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at @@ -2658,4 +2661,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.3805 2005/06/01 13:01:12 dtucker Exp $ +$Id: ChangeLog,v 1.3806 2005/06/01 13:02:25 dtucker Exp $ diff --git a/ssh-keygen.c b/ssh-keygen.c index 05c8f01ef..246c7d50f 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #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 #include @@ -1008,7 +1008,7 @@ 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; + u_int32_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; -- cgit v1.2.3