diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2004-05-09 00:06:48 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2004-05-09 00:06:48 +0000 |
| commit | 4afddfb7b7deaa4e4620bcb76465c20cfe4229ab (patch) | |
| tree | b5a274ce8575e5eb39c0a5d118681853b03cb402 /usr.bin/ssh/ssh-keygen.c | |
| parent | 27fab243d368bdd776992b2c3bca80ba0d75fb1a (diff) | |
zap another tiny header; ok deraadt@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 34ab913790b..029e090707d 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.114 2004/05/08 00:21:31 djm Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.115 2004/05/09 00:06:47 djm Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -27,7 +27,6 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.114 2004/05/08 00:21:31 djm Exp $"); #include "pathnames.h" #include "log.h" #include "misc.h" -#include "moduli.h" #ifdef SMARTCARD #include "scard.h" @@ -81,6 +80,10 @@ extern char *__progname; char hostname[MAXHOSTNAMELEN]; +/* moduli.c */ +int gen_candidates(FILE *, int, int, BIGNUM *); +int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); + static void ask_filename(struct passwd *pw, const char *prompt) { @@ -902,18 +905,9 @@ main(int ac, char **av) break; case 'a': trials = atoi(optarg); - if (trials < TRIAL_MINIMUM) { - fatal("Minimum primality trials is %d", - TRIAL_MINIMUM); - } break; case 'M': memory = atoi(optarg); - if (memory != 0 && - (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) { - fatal("Invalid memory amount (min %ld, max %ld)", - LARGE_MINIMUM, LARGE_MAXIMUM); - } break; case 'G': do_gen_candidates = 1; |