diff options
| author |   djm <djm@openbsd.org> | 2010-04-23 22:48:31 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-04-23 22:48:31 +0000 |
| commit | cef89e71df9a657fbbdd14f03ed3b039fff58b64 (patch) | |
| tree | 6dc520a939b1cfa22667e98d81bda02b3ea11eb3 | |
| parent | set stderr to /dev/null for subsystems rather than just closing it. (diff) | |
| download | wireguard-openbsd-cef89e71df9a657fbbdd14f03ed3b039fff58b64.tar.xz wireguard-openbsd-cef89e71df9a657fbbdd14f03ed3b039fff58b64.zip | |
refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS,
since we would refuse to use them anyway. bz#1516; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index fc1e55b47db..612886b46a0 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.188 2010/04/23 01:47:41 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.189 2010/04/23 22:48:31 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1555,6 +1555,7 @@ main(int argc, char **argv) struct passwd *pw; struct stat st; int opt, type, fd; + u_int maxbits; u_int32_t memory = 0, generator_wanted = 0, trials = 100; int do_gen_candidates = 0, do_screen_candidates = 0; BIGNUM *start = NULL; @@ -1856,6 +1857,12 @@ main(int argc, char **argv) } if (bits == 0) bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS; + maxbits = (type == KEY_DSA) ? + OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS; + if (bits > maxbits) { + fprintf(stderr, "key bits exceeds maximum %d\n", maxbits); + exit(1); + } if (type == KEY_DSA && bits != 1024) fatal("DSA keys must be 1024 bits"); if (!quiet) |