diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-06-01 23:02:25 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-06-01 23:02:25 +1000 |
commit | 2db8ae671eef747f97d3b50eafb525d3778c5dae (patch) | |
tree | b1bd9b7f14f17a9e3d8b0c1c4d5e3e522cff783c | |
parent | fc4f2dd3470681dae24e9ec95aceb2a2a94c3d7e (diff) |
- dtucker@cvs.openbsd.org 2005/05/26 09:08:12
[ssh-keygen.c]
uint32_t -> u_int32_t for consistency; ok djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -10,6 +10,9 @@ | |||
10 | must be a target directory), kill the spawned ssh child before exiting. | 10 | must be a target directory), kill the spawned ssh child before exiting. |
11 | This stops it trying to authenticate and spewing lots of output. | 11 | This stops it trying to authenticate and spewing lots of output. |
12 | deraadt@ ok | 12 | deraadt@ ok |
13 | - dtucker@cvs.openbsd.org 2005/05/26 09:08:12 | ||
14 | [ssh-keygen.c] | ||
15 | uint32_t -> u_int32_t for consistency; ok djm@ | ||
13 | 16 | ||
14 | 20050531 | 17 | 20050531 |
15 | - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at | 18 | - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at |
@@ -2658,4 +2661,4 @@ | |||
2658 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2661 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2659 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2662 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2660 | 2663 | ||
2661 | $Id: ChangeLog,v 1.3805 2005/06/01 13:01:12 dtucker Exp $ | 2664 | $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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.125 2005/05/24 02:05:09 avsm Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.126 2005/05/26 09:08:12 dtucker Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -1008,7 +1008,7 @@ main(int ac, char **av) | |||
1008 | struct passwd *pw; | 1008 | struct passwd *pw; |
1009 | struct stat st; | 1009 | struct stat st; |
1010 | int opt, type, fd, download = 0; | 1010 | int opt, type, fd, download = 0; |
1011 | uint32_t memory = 0, generator_wanted = 0, trials = 100; | 1011 | u_int32_t memory = 0, generator_wanted = 0, trials = 100; |
1012 | int do_gen_candidates = 0, do_screen_candidates = 0; | 1012 | int do_gen_candidates = 0, do_screen_candidates = 0; |
1013 | int log_level = SYSLOG_LEVEL_INFO; | 1013 | int log_level = SYSLOG_LEVEL_INFO; |
1014 | BIGNUM *start = NULL; | 1014 | BIGNUM *start = NULL; |